The overloaded DB_DataObject function staticGet is now called getKV

[quix0rs-gnu-social.git] / plugins / Blacklist / Nickname_blacklist.php

diff --git a/plugins/Blacklist/Nickname_blacklist.php b/plugins/Blacklist/Nickname_blacklist.php
index d5d46a9490e9f58d1b62d1f4a189eea039c589d3..bf1d1e5ab7310b56a1aafdeabaafc4310beb4f64 100644 (file)
--- a/plugins/Blacklist/Nickname_blacklist.php
+++ b/plugins/Blacklist/Nickname_blacklist.php
@@ -44,28 +44,12 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
  *
  * @see      DB_DataObject
  */
-class Nickname_blacklist extends Memcached_DataObject
+class Nickname_blacklist extends Managed_DataObject
 {
     public $__table = 'nickname_blacklist'; // table name
     public $pattern;                        // string pattern
     public $created;                        // datetime
 
-    /**
-     * Get an instance by key
-     *
-     * This is a utility method to get a single instance with a given key value.
-     *
-     * @param string $k Key to use to lookup
-     * @param mixed  $v Value to lookup
-     *
-     * @return Nickname_blacklist object found, or null for no hits
-     *
-     */
-    function staticGet($k, $v=null)
-    {
-        return Memcached_DataObject::staticGet('Nickname_blacklist', $k, $v);
-    }
-
     /**
      * return table definition for DB_DataObject
      *
@@ -140,7 +124,7 @@ class Nickname_blacklist extends Memcached_DataObject
         $toInsert = array_diff($newPatterns, $oldPatterns);
 
         foreach ($toDelete as $pattern) {
-            $nb = Nickname_blacklist::staticGet('pattern', $pattern);
+            $nb = Nickname_blacklist::getKV('pattern', $pattern);
             if (!empty($nb)) {
                 $nb->delete();
             }
@@ -158,7 +142,7 @@ class Nickname_blacklist extends Memcached_DataObject
 
     static function ensurePattern($pattern)
     {
-        $nb = Nickname_blacklist::staticGet('pattern', $pattern);
+        $nb = Nickname_blacklist::getKV('pattern', $pattern);
 
         if (empty($nb)) {
             $nb = new Nickname_blacklist();