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 f4e9844dfc9ddf67ba89c3e43e188c629aabe1b3..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
 
@@ -111,18 +108,6 @@ class User_flag_profile extends Memcached_DataObject
         return array(false, false, false);
     }
 
-    /**
-     * Get a single object with multiple keys
-     *
-     * @param array $kv Map of key-value pairs
-     *
-     * @return User_flag_profile found object or null
-     */
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
-    }
-
     /**
      * Check if a flag exists for given profile and user
      *
@@ -157,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);
         }