Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into...

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

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 0376f1e69d5b59bbced5aedc9dc6f7d8e88bcecf..ffbf9d5a3c0efd0c9c708739aff459a9702bc117 100644 (file)
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -70,7 +70,7 @@ class Status_network extends Safe_DataObject
      * @param string $dbname
      * @param array $servers memcached servers to use for caching config info
      */
-    static function setupDB($dbhost, $dbuser, $dbpass, $dbname, $servers)
+    static function setupDB($dbhost, $dbuser, $dbpass, $dbname, array $servers)
     {
         global $config;
 
@@ -113,7 +113,7 @@ class Status_network extends Safe_DataObject
     }
 
     static function cacheKey($k, $v) {
-        return 'statusnet:' . self::$base . ':status_network:'.$k.':'.$v;
+        return 'gnusocial:' . self::$base . ':status_network:'.$k.':'.$v;
     }
 
     static function memGet($k, $v)
@@ -147,12 +147,12 @@ class Status_network extends Safe_DataObject
         }
     }
 
-    function update($orig=null)
+    function update($dataObject=false)
     {
-        if (is_object($orig)) {
-            $orig->decache(); # might be different keys
+        if (is_object($dataObject)) {
+            $dataObject->decache(); # might be different keys
         }
-        return parent::update($orig);
+        return parent::update($dataObject);
     }
 
     /**
@@ -183,10 +183,10 @@ class Status_network extends Safe_DataObject
         return $result;
     }
 
-    function delete()
+    function delete($useWhere=false)
     {
         $this->decache(); # while we still have the values!
-        return parent::delete();
+        return parent::delete($useWhere);
     }
 
     /**
@@ -318,14 +318,7 @@ class Status_network extends Safe_DataObject
      */
     function getTags()
     {
-        $result = Status_network_tag::getTags($this->site_id);
-
-        // XXX : for backwards compatibility
-        if (empty($result)) {
-            return explode('|', $this->tags);
-        }
-
-        return $result;
+        return Status_network_tag::getTags($this->site_id);
     }
 
     /**
@@ -333,7 +326,7 @@ class Status_network extends Safe_DataObject
      * @param array tags
      * @fixme only add/remove differentials
      */
-    function setTags($tags)
+    function setTags(array $tags)
     {
         $this->clearTags();
         foreach ($tags as $tag) {