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

This reverts commit 9ab0a6f760ddf847b4f9ec13ea6a04d123bb9cb0.

diff --git a/lib/noticestream.php b/lib/noticestream.php
index e9ff47b68c154eb73641cbaf97dbb1b0126c2cae..be28aa61867526f56214ca9ed7f9f6b9534e20a7 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -59,6 +59,42 @@ abstract class NoticeStream
 
     static function getStreamByIds($ids)
     {
-       return Notice::multiGet('id', $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);
+        }
     }
 }