Merge branch 'master' of gitorious.org:statusnet/mainline

1 files changed, 8 insertions, 0 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index be3e9ca2a..b416e2ff2 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -964,11 +964,19 @@ class Notice extends Memcached_DataObject
      */
     function saveKnownReplies($uris)
     {
+        if (empty($uris)) {
+            return;
+        }
+        $sender = Profile::staticGet($this->profile_id);
+
         foreach ($uris as $uri) {
 
             $user = User::staticGet('uri', $uri);
 
             if (!empty($user)) {
+                if ($user->hasBlocked($sender)) {
+                    continue;
+                }
 
                 $reply = new Reply();