pkeyGet is now static and more similar to getKV

[quix0rs-gnu-social.git] / plugins / UserFlag / User_flag_profile.php

diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index 69fe0f356b79b5d36fdf6f850fa0509546d48145..cd641fc53cc94185fc065e78b77ffc604b506db4 100644 (file)
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -44,7 +44,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class User_flag_profile extends Memcached_DataObject
+class User_flag_profile extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -55,9 +55,6 @@ class User_flag_profile extends Memcached_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $cleared;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_flag_profile',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -79,33 +76,36 @@ class User_flag_profile extends Memcached_DataObject
     /**
      * return key definitions for DB_DataObject
      *
-     * @return array key definitions
+     * @return array of key names
      */
     function keys()
     {
-        return array('profile_id' => 'K', 'user_id' => 'K');
+        return array_keys($this->keyTypes());
     }
 
     /**
      * return key definitions for DB_DataObject
      *
-     * @return array key definitions
+     * @return array map of key definitions
      */
     function keyTypes()
     {
-        return $this->keys();
+        return array('profile_id' => 'K', 'user_id' => 'K');
     }
 
     /**
-     * Get a single object with multiple keys
+     * Magic formula for non-autoincrementing integer primary keys
      *
-     * @param array $kv Map of key-value pairs
+     * If a table has a single integer column as its primary key, DB_DataObject
+     * assumes that the column is auto-incrementing and makes a sequence table
+     * to do this incrementation. Since we don't need this for our class, we
+     * overload this method and return the magic formula that DB_DataObject needs.
      *
-     * @return User_flag_profile found object or null
+     * @return array magic three-false array that stops auto-incrementing.
      */
-    function pkeyGet($kv)
+    function sequenceKey()
     {
-        return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
+        return array(false, false, false);
     }
 
     /**
@@ -142,7 +142,8 @@ class User_flag_profile extends Memcached_DataObject
 
         if (!$ufp->insert()) {
             // TRANS: Server exception.
-            $msg = sprintf(_m('Couldn\'t flag profile "%d" for review.'),
+            // TRANS: %d is a profile ID (number).
+            $msg = sprintf(_m('Could not flag profile "%d" for review.'),
                            $profile_id);
             throw new ServerException($msg);
         }