Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

diff --git a/classes/Notice.php b/classes/Notice.php
index a813db99b3b234a8ab8a057a4a6f1084c4da689a..97193dbb3439a54af8613029c8b6f6d30f07a53f 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1513,7 +1513,9 @@ class Notice extends Managed_DataObject
 
             if ($this->repeat_of) {
                 $repeated = Notice::staticGet('id', $this->repeat_of);
-                $act->objects[] = $repeated->asActivity($cur);
+                if (!empty($repeated)) {
+                    $act->objects[] = $repeated->asActivity($cur);
+                }
             } else {
                 $act->objects[] = ActivityObject::fromNotice($this);
             }

diff --git a/lib/profilenoticestream.php b/lib/profilenoticestream.php
index dc825c9fb14e1224ea9543012d142cd5266d4e4e..f7154a52be9563ae3bc90551ee370838ae84771d 100644 (file)
--- a/lib/profilenoticestream.php
+++ b/lib/profilenoticestream.php
@@ -95,7 +95,7 @@ class ProfileNoticeStream extends ScopingNoticeStream
 
         if (common_config('notice', 'hidespam')) {
             if ($this->streamProfile->hasRole(Profile_role::SILENCED) &&
-                (empty($this->userProfile) || ($this->userProfile->id !== $this->streamProfile->id) && !$this->userProfile->hasRight(Right::REVIEWSPAM))) {
+                (empty($this->userProfile) || (($this->userProfile->id !== $this->streamProfile->id) && !$this->userProfile->hasRight(Right::REVIEWSPAM)))) {
                 return true;
             }
         }