Qvitter Update

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

diff --git a/classes/Status_network_tag.php b/classes/Status_network_tag.php
index 7dab232897bcb3f64601c980c52bc338788314d3..9e5ff89be352c9863d72a977756c8445ae5da7ea 100644 (file)
--- a/classes/Status_network_tag.php
+++ b/classes/Status_network_tag.php
@@ -26,7 +26,7 @@ class Status_network_tag extends Safe_DataObject
 
     public $__table = 'status_network_tag';                      // table name
     public $site_id;                  // int(4)  primary_key not_null
-    public $tag;                      // varchar(64)  primary_key not_null 
+    public $tag;                      // varchar(64)  primary_key not_null
     public $created;                 // datetime()   not_null
 
 
@@ -34,7 +34,7 @@ class Status_network_tag extends Safe_DataObject
     {
         global $config;
         global $_DB_DATAOBJECT;
-        
+
         $sn = new Status_network();
         $sn->_connect();
 
@@ -43,10 +43,13 @@ class Status_network_tag extends Safe_DataObject
         $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
@@ -57,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);
     }
 
     /**
@@ -99,7 +98,7 @@ class Status_network_tag extends Safe_DataObject
 
         if (Status_network::$cache) {
             $packed = implode('|', $result);
-            Status_network::$cache->set($key, $packed, 3600);
+            Status_network::$cache->set($key, $packed, 0, 3600);
         }
 
         return $result;
@@ -112,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);
         }
     }
 
@@ -124,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;
     }
 }