Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/classes/Reply.php b/classes/Reply.php
index f2c308fac4ebd7573f2131c00b4523cd1fede39d..d3405e6581c26213a9d658e5e8408ef9c2912a71 100644 (file)
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -15,10 +15,6 @@ class Reply extends Managed_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
     public $replied_id;                      // int(4)
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Reply',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -44,11 +40,6 @@ class Reply extends Managed_DataObject
             ),
         );
     }    
-
-       function pkeyGet($kv)
-       {
-               return Memcached_DataObject::pkeyGet('Reply',$kv);   
-       }
        
     /**
      * Wrapper for record insertion to update related caches
@@ -64,10 +55,9 @@ class Reply extends Managed_DataObject
         return $result;
     }
 
-    function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+    static function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
     {
         $stream = new ReplyNoticeStream($user_id);
-
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 }