X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FStatus_network.php;h=5d01e72ccc9041c62f1313891963bf820fdfaa37;hb=b3cd558fe777e2e2460eaff44a85a58a846fab60;hp=5680c145843671d0dd126e4bd0dad5b8b98839d5;hpb=125ff142e871d4cde780335d6a4f16d5f59bca83;p=quix0rs-gnu-social.git

diff --git a/classes/Status_network.php b/classes/Status_network.php
index 5680c14584..5d01e72ccc 100644
--- a/classes/Status_network.php
+++ b/classes/Status_network.php
@@ -167,18 +167,17 @@ class Status_network extends Safe_DataObject
             ' WHERE nickname = ' . $this->_quote($this->nickname);
         $orig->decache();
         $result = $this->query($qry);
-        if ($result) {
-            $this->encache();
-        }
+        $this->decache();
+
         return $result;
     }
-    
+
     function delete()
     {
         $this->decache(); # while we still have the values!
         return parent::delete();
     }
-    
+
     /**
      * @param string $servername hostname
      * @param string $wildcard hostname suffix to match wildcard config
@@ -308,27 +307,20 @@ class Status_network extends Safe_DataObject
      */
     function getTags()
     {
-        $result = array();
-        
-        $tags = new Status_network_tag();
-        $tags->site_id = $this->site_id;
-        if ($tags->find()) {
-            while ($tags->fetch()) {
-                $result[] = $tags->tag;
-            }
-        }
+        $result = Status_network_tag::getTags($this->site_id);
 
         // XXX : for backwards compatibility
         if (empty($result)) {
             return explode('|', $this->tags);
         }
-        
+
         return $result;
     }
 
     /**
      * Save a given set of tags
      * @param array tags
+     * @fixme only add/remove differentials
      */
     function setTags($tags)
     {
@@ -339,7 +331,7 @@ class Status_network extends Safe_DataObject
                 $snt->site_id = $this->site_id;
                 $snt->tag = $tag;
                 $snt->created = common_sql_now();
-                
+
                 $id = $snt->insert();
                 if (!$id) {
                     // TRANS: Exception thrown when a tag cannot be saved.
@@ -364,7 +356,7 @@ class Status_network extends Safe_DataObject
 
         $tag->free();
     }
-    
+
     /**
      * Check if this site record has a particular meta-info tag attached.
      * @param string $tag