Revert "Hide posts by silenced users"

This reverts commit d22fc7423ce2365e229fb41e0dae97f069ec2214.

diff --git a/classes/Notice.php b/classes/Notice.php
index 38e41d29f17634533183d2976921a13a47e4eaab..9ee5696e3f47a3cb68a8ccb79ca3422edcaccae4 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -2381,22 +2381,6 @@ class Notice extends Managed_DataObject
             $scope = self::defaultScope();
         }
 
-        $author = $this->getProfile();
-
-        // Author is always in scope
-
-        if ($author->id == $profile->id) {
-            return true;
-        }
-
-        // If the author is silenced, only show to 
-        // folks who can un-silence; note ignores scope
-
-        if ($author->hasRole(Profile_role::SILENCED) &&
-            (empty($profile) || !$profile->hasRight(Right::SILENCEUSER))) {
-            return false;
-        }
-
         // If there's no scope, anyone (even anon) is in scope.
 
         if ($scope == 0) {
@@ -2409,6 +2393,12 @@ class Notice extends Managed_DataObject
             return false;
         }
 
+        // Author is always in scope
+
+        if ($this->profile_id == $profile->id) {
+            return true;
+        }
+
         // Only for users on this site
 
         if ($scope & Notice::SITE_SCOPE) {
@@ -2455,6 +2445,7 @@ class Notice extends Managed_DataObject
         // Only for followers of the author
 
         if ($scope & Notice::FOLLOWER_SCOPE) {
+            $author = $this->getProfile();
             if (!Subscription::exists($profile, $author)) {
                 return false;
             }