diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-16 22:40:57 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-02-16 22:40:57 +0000 |
| commit | e8ceb11f2e86ab42b491db450f4333d5d192524f (patch) | |
| tree | 18df35c8191dc39dbea821daadc971129c2866aa /classes/Notice.php | |
| parent | 6440f4cecdf507d49db015bbf4303e50eaadbe13 (diff) | |
| parent | 7638adf49e6142617712ba897b529cff9fcd68a3 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'classes/Notice.php')
| -rw-r--r-- | classes/Notice.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 6db59c96e..b8cd2bd7f 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -136,10 +136,12 @@ class Notice extends Memcached_DataObject $notice->profile_id = $profile_id; $blacklist = common_config('public', 'blacklist'); + $autosource = common_config('public', 'autosource'); # Blacklisted are non-false, but not 1, either - if ($blacklist && in_array($profile_id, $blacklist)) { + if (($blacklist && in_array($profile_id, $blacklist)) || + ($source && $autosource && in_array($source, $autosource))) { $notice->is_local = -1; } else { $notice->is_local = $is_local; |