X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fnoticestream.php;h=e9ff47b68c154eb73641cbaf97dbb1b0126c2cae;hb=9145ce4259676143f42292521d9a6318a3b6be09;hp=025138be4ded80db592be3f9e46ed0138b92d9a8;hpb=36b331d469b6dcd1101783f21265f7be624bc58f;p=quix0rs-gnu-social.git

diff --git a/lib/noticestream.php b/lib/noticestream.php
index 025138be4d..e9ff47b68c 100644
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -48,7 +48,7 @@ abstract class NoticeStream
 {
     abstract function getNoticeIds($offset, $limit, $since_id, $max_id);
 
-    function getNotices($offset, $limit, $sinceId, $maxId)
+    function getNotices($offset, $limit, $sinceId = null, $maxId = null)
     {
         $ids = $this->getNoticeIds($offset, $limit, $sinceId, $maxId);
 
@@ -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);
     }
 }