Merge branch 'master' into mmn_fixes

[quix0rs-gnu-social.git] / lib / moderatednoticestream.php

diff --git a/lib/moderatednoticestream.php b/lib/moderatednoticestream.php
index 3c778d8a2caba70a0a27b8f3ca6caacb0b2df7d3..f984256acc4ad824fde11e3aa8108af17497546f 100644 (file)
--- a/lib/moderatednoticestream.php
+++ b/lib/moderatednoticestream.php
@@ -28,8 +28,11 @@ class ModeratedNoticeStream extends ScopingNoticeStream
 
         // If the notice author is sandboxed
         if ($notice->getProfile()->isSandboxed()) {
-            // and we're either not logged in OR we aren't some kind of privileged user that can see spam etc.
-            if (!$this->scoped instanceof Profile || !$this->scoped->hasRight(Right::REVIEWSPAM)) {
+            if (!$this->scoped instanceof Profile) {
+                // Non-logged in users don't get to see posts by sandboxed users
+                return false;
+            } elseif (!$notice->getProfile()->sameAs($this->scoped) && !$this->scoped->hasRight(Right::REVIEWSPAM)) {
+                // And if we are logged in, deny if scoped user is neither the author nor has the right to review spam
                 return false;
             }
         }