Less redundant code.

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

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 77c89dc8ce8713bc0b0306d22cd24302b19dce49..b864de80092b31001b03a8048519b0ab97b6e5ee 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -29,10 +29,6 @@ class Notice_tag extends Managed_DataObject
     public $notice_id;                       // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -52,6 +48,7 @@ class Notice_tag extends Managed_DataObject
             'indexes' => array(
                 'notice_tag_created_idx' => array('created'),
                 'notice_tag_notice_id_idx' => array('notice_id'),
+                'notice_tag_tag_created_notice_id_idx' => array('tag', 'created', 'notice_id')
             ),
         );
     }
@@ -59,8 +56,7 @@ class Notice_tag extends Managed_DataObject
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
         $stream = new TagNoticeStream($tag);
-        
-        return $stream->getNotices($offset, $limit, $sinceId, $maxId);
+        return $stream;
     }
 
     function blowCache($blowLast=false)
@@ -71,11 +67,6 @@ class Notice_tag extends Managed_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
-    }
-
        static function url($tag)
        {
                if (common_config('singleuser', 'enabled')) {