X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FReply.php;h=e19ae789ecd6b4909f923c3010a8d108e058f3b5;hb=c12bb0ab6a2dbfc36113e5d45114a7e1671ff018;hp=3cc4b942ca74608a1a9945070dd2a941247c58ce;hpb=d594c83a5a9a9d42fce917b544c28591fcadb1aa;p=quix0rs-gnu-social.git

diff --git a/classes/Reply.php b/classes/Reply.php
index 3cc4b942ca..e19ae789ec 100644
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -12,13 +12,9 @@ class Reply extends Managed_DataObject
     public $__table = 'reply';                           // table name
     public $notice_id;                       // int(4)  primary_key not_null
     public $profile_id;                      // int(4)  primary_key not_null
-    public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $modified;                        // datetime()   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
 
@@ -28,7 +24,7 @@ class Reply extends Managed_DataObject
             'fields' => array(
                 'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
                 'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
-                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+                'modified' => array('type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'),
                 'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
             ),
             'primary key' => array('notice_id', 'profile_id'),
@@ -40,14 +36,10 @@ class Reply extends Managed_DataObject
                 'reply_notice_id_idx' => array('notice_id'),
                 'reply_profile_id_idx' => array('profile_id'),
                 'reply_replied_id_idx' => array('replied_id'),
+                'reply_profile_id_modified_notice_id_idx' => array('profile_id', 'modified', 'notice_id')
             ),
         );
     }    
-
-	function pkeyGet($kv)
-	{
-		return Memcached_DataObject::pkeyGet('Reply',$kv);   
-	}
 	
     /**
      * Wrapper for record insertion to update related caches
@@ -63,10 +55,11 @@ 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);
-
+        // FIXME: Use some other method to get Profile::current() in order
+        // to avoid confusion between background processing and session user.
+        $stream = new ReplyNoticeStream($user_id, Profile::current());
         return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 }