Merge branch 'testing' into 0.9.x

Conflicts:
	index.php

1 files changed, 1 insertions, 3 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 42c235b1a..c0828674d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1007,8 +1007,6 @@ class Notice extends Memcached_DataObject
                 $reply->profile_id = $user->id;
 
                 $id = $reply->insert();
-
-                self::blow('reply:stream:%d', $user->id);
             }
         }
 
@@ -1074,6 +1072,7 @@ class Notice extends Memcached_DataObject
                     throw new ServerException("Couldn't save reply for {$this->id}, {$mentioned->id}");
                 } else {
                     $replied[$mentioned->id] = 1;
+                    self::blow('reply:stream:%d', $mentioned->id);
                 }
             }
         }
@@ -1129,7 +1128,6 @@ class Notice extends Memcached_DataObject
         foreach ($recipientIds as $recipientId) {
             $user = User::staticGet('id', $recipientId);
             if (!empty($user)) {
-                self::blow('reply:stream:%d', $recipientId);
                 mail_notify_attn($user, $this);
             }
         }