diff options
| author | Evan Prodromou <evan@status.net> | 2009-11-17 14:51:38 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-11-17 14:51:38 -0500 |
| commit | 3a980a75fc04da27da693925ee8401fc33602b8e (patch) | |
| tree | d3158177341f27d5083fe1b58dd7c4819595d2f8 /classes | |
| parent | cb4acd40bf6bedd32f8352e73654e0fbff730cf8 (diff) | |
| parent | 4ff2d37b10977f77fe3e627f93176657a45270bb (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 1db431f2a..ebb5022b9 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -207,7 +207,7 @@ class Notice extends Memcached_DataObject # Sandboxed are non-false, but not 1, either - if (!$user->hasRight(Right::PUBLICNOTICE) || + if (!$profile->hasRight(Right::PUBLICNOTICE) || ($source && $autosource && in_array($source, $autosource))) { $notice->is_local = Notice::LOCAL_NONPUBLIC; } else { |