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 2273ecb2e5cf90fb08d96c30ba3ca65996673474..b45224ff74c5225b02fa23c21d10269c9ba65d22 100644 (file)
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -38,14 +38,18 @@ 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();
     }
 
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
+
     /* Static get */
-    function staticGet($k,$v=null)
+    static function getKV($k,$v=null)
     {
+        // TODO: This probably has to be converted to a non-static call
         $i = DB_DataObject::staticGet('Status_network_tag',$k,$v);
 
         // Don't use local process cache; if we're fetching multiple
@@ -56,13 +60,9 @@ class Status_network_tag extends Safe_DataObject
         return $i;
     }
 
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-
-    function pkeyGet($kv)
+    static function pkeyGet($kv)
     {
-        return Memcached_DataObject::pkeyGet('Status_network_tag', $kv);
+        return Memcached_DataObject::pkeyGetClass('Status_network_tag', $kv);
     }
 
     /**
@@ -111,8 +111,10 @@ class Status_network_tag extends Safe_DataObject
     function decache()
     {
         $key = 'status_network_tags:' . $this->site_id;
-        if (Status_network::$cache) {
-            Status_network::$cache->delete($key);
+        if (Status_network::$cache || Status_network::$cacheInitialized) {
+            // FIXME: this was causing errors, so I'm hiding them.
+            // I'm a big chicken and lazy.
+            @Status_network::$cache->delete($key);
         }
     }
 
@@ -123,10 +125,20 @@ 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)
+    {
+        $snt = new Status_network_tag();
+
+        $snt->tag = $tag;
+
+        $snt->find();
+
+        return $snt;
     }
 }