Merge branch 'lookup_url_fix' into 'nightly'

[quix0rs-gnu-social.git] / classes / Status_network_tag.php

diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php
index ba0e7d90f253f45ad79d83741bb9fe3cba8294c4..b45224ff74c5225b02fa23c21d10269c9ba65d22 100644 (file)
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -38,7 +38,7 @@ class Status_network_tag extends Safe_DataObject
         $sn = new Status_network();
         $sn->_connect();
 
-        $config['db']['table_'. $this->__table] = $sn->_database;
+        $config['db']['table_'. $this->tableName()] = $sn->_database;
 
         $this->_connect();
     }
@@ -60,9 +60,9 @@ class Status_network_tag extends Safe_DataObject
         return $i;
     }
 
-    function pkeyGet($kv)
+    static function pkeyGet($kv)
     {
-        return Memcached_DataObject::pkeyGet('Status_network_tag', $kv);
+        return Memcached_DataObject::pkeyGetClass('Status_network_tag', $kv);
     }
 
     /**
@@ -125,11 +125,10 @@ class Status_network_tag extends Safe_DataObject
         return $ret;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
-        $ret = parent::delete();
         $this->decache();
-        return $ret;
+        return parent::delete($useWhere);
     }
 
     static function withTag($tag)