From 02880f5a8cdab878b94afd30b90fdd922f4af47e Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Tue, 2 Aug 2011 11:09:30 -0400 Subject: [PATCH] use pkeyGet() instead of getReplies() checking addressee scope --- classes/Notice.php | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/classes/Notice.php b/classes/Notice.php index d577408fef..952194d43d 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1371,17 +1371,11 @@ class Notice extends Memcached_DataObject */ function getReplyProfiles() { - $ids = $this->getReplies(); - $profiles = array(); - - foreach ($ids as $id) { - $profile = Profile::staticGet('id', $id); - if (!empty($profile)) { - $profiles[] = $profile; - } - } + $ids = $this->getReplies(); - return $profiles; + $profiles = Profile::multiGet('id', $ids); + + return $profiles->fetchAll(); } /** @@ -2376,11 +2370,10 @@ class Notice extends Memcached_DataObject if ($this->scope & Notice::ADDRESSEE_SCOPE) { - // XXX: just query for the single reply - - $replies = $this->getReplies(); - - if (!in_array($profile->id, $replies)) { + $repl = Reply::pkeyGet(array('notice_id' => $this->id, + 'profile_id' => $profile->id)); + + if (empty($repl)) { return false; } }