Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / classes / Notice_tag.php

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 4fd76e8ea85e8c04c9119b370bf3c89a462d7dec..ea38bb3502f86d47e8a0aeec5c3affd8af41ee8f 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -40,13 +40,13 @@ class Notice_tag extends Memcached_DataObject
 
         $ids = Notice::stream(array('Notice_tag', '_streamDirect'),
                               array($tag),
-                              'notice_tag:notice_ids:' . common_keyize($tag),
+                              'notice_tag:notice_ids:' . Cache::keyize($tag),
                               $offset, $limit);
 
         return Notice::getStreamByIds($ids);
     }
 
-    function _streamDirect($tag, $offset, $limit, $since_id, $max_id, $since)
+    function _streamDirect($tag, $offset, $limit, $since_id, $max_id)
     {
         $nt = new Notice_tag();
 
@@ -60,11 +60,7 @@ class Notice_tag extends Memcached_DataObject
         }
 
         if ($max_id != 0) {
-            $nt->whereAdd('notice_id < ' . $max_id);
-        }
-
-        if (!is_null($since)) {
-            $nt->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+            $nt->whereAdd('notice_id <= ' . $max_id);
         }
 
         $nt->orderBy('notice_id DESC');
@@ -86,9 +82,9 @@ class Notice_tag extends Memcached_DataObject
 
     function blowCache($blowLast=false)
     {
-        self::blow('notice_tag:notice_ids:%s', common_keyize($this->tag));
+        self::blow('notice_tag:notice_ids:%s', Cache::keyize($this->tag));
         if ($blowLast) {
-            self::blow('notice_tag:notice_ids:%s;last', common_keyize($this->tag));
+            self::blow('notice_tag:notice_ids:%s;last', Cache::keyize($this->tag));
         }
     }