The overloaded DB_DataObject function staticGet is now called getKV

[quix0rs-gnu-social.git] / plugins / AnonymousFave / Fave_tally.php

diff --git a/plugins/AnonymousFave/Fave_tally.php b/plugins/AnonymousFave/Fave_tally.php
index b350d5a0a5feb303fd70468adfdd11e2e61c7235..5962e5ad87f474cb1e140bcdc0f3ba464145311b 100644 (file)
--- a/plugins/AnonymousFave/Fave_tally.php
+++ b/plugins/AnonymousFave/Fave_tally.php
@@ -44,8 +44,7 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
-class Fave_tally extends Memcached_DataObject
+class Fave_tally extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -55,9 +54,6 @@ class Fave_tally extends Memcached_DataObject
     public $count;                           // int(4)  not_null
     public $modified;                        // datetime   not_null default_0000-00-00%2000%3A00%3A00
 
-    /* Static get */
-    function staticGet($k, $v = NULL) { return Memcached_DataObject::staticGet('Fave_tally', $k, $v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -85,7 +81,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return array list of key field names
      */
-
     function keys()
     {
         return array_keys($this->keyTypes());
@@ -103,7 +98,6 @@ class Fave_tally 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('notice_id' => 'K');
@@ -119,8 +113,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return array magic three-false array that stops auto-incrementing.
      */
-
-
     function sequenceKey()
     {
         return array(false, false, false);
@@ -133,7 +125,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return User_flag_profile found object or null
      */
-
     function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Fave_tally', $kv);
@@ -146,7 +137,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return Fave_tally $tally the tally data object
      */
-
     static function increment($noticeID)
     {
         $tally = Fave_tally::ensureTally($noticeID);
@@ -157,7 +147,9 @@ class Fave_tally extends Memcached_DataObject
 
         if (!$result) {
             $msg = sprintf(
-                _m("Couldn't update favorite tally for notice ID %d."),
+                // TRANS: Server exception.
+                // TRANS: %d is the notice ID (number).
+                _m("Could not update favorite tally for notice ID %d."),
                 $noticeID
             );
             throw new ServerException($msg);
@@ -173,7 +165,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return Fave_tally $tally the tally data object
      */
-
     static function decrement($noticeID)
     {
         $tally = Fave_tally::ensureTally($noticeID);
@@ -185,7 +176,9 @@ class Fave_tally extends Memcached_DataObject
 
             if (!$result) {
                 $msg = sprintf(
-                    _m("Couldn't update favorite tally for notice ID %d."),
+                    // TRANS: Server exception.
+                    // TRANS: %d is the notice ID (number).
+                    _m("Could not update favorite tally for notice ID %d."),
                     $noticeID
                 );
                 throw new ServerException($msg);
@@ -203,10 +196,9 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return Fave_tally the tally data object
      */
-
     static function ensureTally($noticeID)
     {
-        $tally = Fave_tally::staticGet('notice_id', $noticeID);
+        $tally = Fave_tally::getKV('notice_id', $noticeID);
 
         if (!$tally) {
             $tally = new Fave_tally();
@@ -215,7 +207,9 @@ class Fave_tally extends Memcached_DataObject
             $result = $tally->insert();
             if (!$result) {
                 $msg = sprintf(
-                    _m("Couldn't create favorite tally for notice ID %d."),
+                    // TRANS: Server exception.
+                    // TRANS: %d is the notice ID (number).
+                    _m("Could not create favorite tally for notice ID %d."),
                     $noticeID
                 );
                 throw new ServerException($msg);
@@ -233,7 +227,6 @@ class Fave_tally extends Memcached_DataObject
      *
      * @return integer $total total number of time the notice has been favored
      */
-
     static function countExistingFaves($noticeID)
     {
         $fave = new Fave();