From: Evan Prodromou <evan@status.net>
Date: Thu, 14 Jul 2011 17:15:28 +0000 (-0400)
Subject: Revert "Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()""
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=18fe1ac5240b60e89218c5c8ff8d0bf65b790730;p=quix0rs-gnu-social.git

Revert "Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()""

This reverts commit b1c12648f06332afe7007d61ec1b8c5060c35133.
---

diff --git a/lib/noticestream.php b/lib/noticestream.php
index be28aa6186..e9ff47b68c 100644
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -59,42 +59,6 @@ abstract class NoticeStream
 
     static function getStreamByIds($ids)
     {
-        $cache = Cache::instance();
-
-        if (!empty($cache)) {
-            $notices = array();
-            foreach ($ids as $id) {
-                $n = Notice::staticGet('id', $id);
-                if (!empty($n)) {
-                    $notices[] = $n;
-                }
-            }
-            return new ArrayWrapper($notices);
-        } else {
-            $notice = new Notice();
-            if (empty($ids)) {
-                //if no IDs requested, just return the notice object
-                return $notice;
-            }
-            $notice->whereAdd('id in (' . implode(', ', $ids) . ')');
-
-            $notice->find();
-
-            $temp = array();
-
-            while ($notice->fetch()) {
-                $temp[$notice->id] = clone($notice);
-            }
-
-            $wrapped = array();
-
-            foreach ($ids as $id) {
-                if (array_key_exists($id, $temp)) {
-                    $wrapped[] = $temp[$id];
-                }
-            }
-
-            return new ArrayWrapper($wrapped);
-        }
+    	return Notice::multiGet('id', $ids);
     }
 }