diff options
author | Evan Prodromou <evan@status.net> | 2010-09-02 16:58:55 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-09-02 16:58:55 -0400 |
commit | 82b1d6daefc29c870ea71b29ab851153642f270b (patch) | |
tree | 61db5e4fcee85ae0b2e94563e50c78ca794bcf4f /classes/Notice.php | |
parent | 7517409bf16137a9d8a420b7358f30fa55945ba0 (diff) | |
parent | ebcd8644a51b66d73971d581789e7c70b82007b2 (diff) |
Merge branch 'swat0' into 0.9.x
Diffstat (limited to 'classes/Notice.php')
-rw-r--r-- | classes/Notice.php | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index 5a70f70b6..14477b1b5 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1019,25 +1019,31 @@ class Notice extends Memcached_DataObject if (empty($uris)) { return; } + $sender = Profile::staticGet($this->profile_id); foreach (array_unique($uris) as $uri) { - $user = User::staticGet('uri', $uri); + $profile = Profile::fromURI($uri); - if (!empty($user)) { - if ($user->hasBlocked($sender)) { - continue; - } + if (empty($profile)) { + common_log(LOG_WARNING, "Unable to determine profile for URI '$uri'"); + continue; + } - $reply = new Reply(); + if ($profile->hasBlocked($sender)) { + common_log(LOG_INFO, "Not saving reply to profile {$profile->id} ($uri) from sender {$sender->id} because of a block."); + continue; + } - $reply->notice_id = $this->id; - $reply->profile_id = $user->id; - common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $user->id"); + $reply = new Reply(); - $id = $reply->insert(); - } + $reply->notice_id = $this->id; + $reply->profile_id = $profile->id; + + common_log(LOG_INFO, __METHOD__ . ": saving reply: notice $this->id to profile $profile->id"); + + $id = $reply->insert(); } return; |