diff options
| author | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-09-22 10:45:34 -0400 |
| commit | b5cfcba4712809cb17eabba299ce5ff04f4d7d70 (patch) | |
| tree | 38235bafd6ddf194e484b97321c0c341bea9de38 /classes/Status_network.php | |
| parent | 91a186251047127ad7f1238f47ff761d9127627c (diff) | |
| parent | f0105893b0b78ff88d08cc2417773ad8a44dc2fa (diff) | |
Merge branch '0.9.x' into activityexport
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'classes/Status_network.php')
| -rw-r--r-- | classes/Status_network.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index c4f37ce1c..70c7a58eb 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -167,9 +167,8 @@ 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; } |