use pkeyGet() instead of getReplies() checking addressee scope

diff --git a/classes/Notice.php b/classes/Notice.php
index d577408feff2206a444a4320568957ee89e27f42..952194d43d1522bf2197ceb8826717e4ea470d02 100644 (file)
--- 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;
             }
         }