eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Introduce a ConfigException

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-03-02 12:33:06 +01:00
parent 9534969c05
commit d6598e790c
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
classes/Notice.php
View File

@@ -507,8 +507,7 @@ class Notice extends Managed_DataObject
$notice = new Notice();
$notice->profile_id = $profile_id;
$autosource = common_config('public', 'autosource');
if ($source && $autosource && in_array($source, $autosource)) {
if ($source && in_array($source, common_config('public', 'autosource'))) {
$notice->is_local = Notice::LOCAL_NONPUBLIC;
} else {
$notice->is_local = $is_local;
@@ -823,8 +822,7 @@ class Notice extends Managed_DataObject
// Since then we have started just filtering _when_ it gets shown
// instead of creating a mixed jumble of differently scoped notices.
$autosource = common_config('public', 'autosource');
if ($source && $autosource && in_array($source, $autosource)) {
if ($source && in_array($source, common_config('public', 'autosource'))) {
$stored->is_local = Notice::LOCAL_NONPUBLIC;
} else {
$stored->is_local = intval($is_local);