diff options
author | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-09-30 11:31:29 -0700 |
commit | 20f2167425fcbdca3281960297a0a006f4efbddf (patch) | |
tree | 22eae18225dbcef59592b411ffb8bbd5b3e253ed /classes/Status_network.php | |
parent | 1acc7d66c63e0b9f794791e3a2e2b0f60bc2ebb1 (diff) | |
parent | 49611af76de5fca165edd79acefa09851706f8cd (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
Diffstat (limited to 'classes/Status_network.php')
-rw-r--r-- | classes/Status_network.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index 70c7a58eb..5d01e72cc 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -168,16 +168,16 @@ class Status_network extends Safe_DataObject $orig->decache(); $result = $this->query($qry); $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 @@ -313,7 +313,7 @@ class Status_network extends Safe_DataObject if (empty($result)) { return explode('|', $this->tags); } - + return $result; } @@ -331,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. @@ -356,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 |