Merge branch '1.0.x'

[quix0rs-gnu-social.git] / plugins / TwitterBridge / Twitter_synch_status.php

diff --git a/plugins/TwitterBridge/Twitter_synch_status.php b/plugins/TwitterBridge/Twitter_synch_status.php
index 1b3ad48fea473d1df68b8a4e9e63a037eed6eac3..9c61e7e7e0fd0f82052ddcc28ee0e5ed483a393c 100644 (file)
--- a/plugins/TwitterBridge/Twitter_synch_status.php
+++ b/plugins/TwitterBridge/Twitter_synch_status.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-
 class Twitter_synch_status extends Memcached_DataObject
 {
     public $__table = 'twitter_synch_status'; // table name
@@ -64,13 +63,24 @@ class Twitter_synch_status extends Memcached_DataObject
      * @param string $k Key to use to lookup (usually 'foreign_id' for this class)
      * @param mixed  $v Value to lookup
      *
-     * @return User_greeting_count object found, or null for no hits
-     *
+     * @return Twitter_synch_status object found, or null for no hits
      */
-
     function staticGet($k, $v=null)
     {
-        return Memcached_DataObject::staticGet('Twitter_synch_status', $k, $v);
+        throw new Exception("Use pkeyGet() for this class.");
+    }
+
+    /**
+     * Get an instance by compound primary key
+     *
+     * @param array $kv key-value pair array
+     *
+     * @return Twitter_synch_status object found, or null for no hits
+     *
+     */
+    function pkeyGet($kv)
+    {
+        return Memcached_DataObject::pkeyGet('Twitter_synch_status', $kv);
     }
 
     /**
@@ -81,7 +91,6 @@ class Twitter_synch_status extends Memcached_DataObject
      *
      * @return array array of column definitions
      */
-
     function table()
     {
         return array('foreign_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
@@ -101,7 +110,6 @@ class Twitter_synch_status extends Memcached_DataObject
      *
      * @return array list of key field names
      */
-
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -119,7 +127,6 @@ class Twitter_synch_status extends Memcached_DataObject
      *         'K' for primary key: for compound keys, add an entry for each component;
      *         'U' for unique keys: compound keys are not well supported here.
      */
-
     function keyTypes()
     {
         return array('foreign_id' => 'K',
@@ -136,7 +143,6 @@ class Twitter_synch_status extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
     function sequenceKey()
     {
         return array(false, false, false);
@@ -144,8 +150,8 @@ class Twitter_synch_status extends Memcached_DataObject
 
     static function getLastId($foreign_id, $timeline)
     {
-        $tss = self::staticGet(array('foreign_id' => $foreign_id,
-                                     'timeline' => $timeline));
+        $tss = self::pkeyGet(array('foreign_id' => $foreign_id,
+                                   'timeline' => $timeline));
 
         if (empty($tss)) {
             return null;
@@ -156,11 +162,10 @@ class Twitter_synch_status extends Memcached_DataObject
 
     static function setLastId($foreign_id, $timeline, $last_id)
     {
-        $tss = self::staticGet(array('foreign_id' => $foreign_id,
-                                     'timeline' => $timeline));
+        $tss = self::pkeyGet(array('foreign_id' => $foreign_id,
+                                   'timeline' => $timeline));
 
         if (empty($tss)) {
-
             $tss = new Twitter_synch_status();
 
             $tss->foreign_id = $foreign_id;
@@ -172,9 +177,7 @@ class Twitter_synch_status extends Memcached_DataObject
             $tss->insert();
 
             return true;
-
         } else {
-
             $orig = clone($tss);
 
             $tss->last_id  = $last_id;