diff options
| -rw-r--r-- | classes/Fave.php | 2 | ||||
| -rw-r--r-- | classes/User.php | 2 | ||||
| -rwxr-xr-x | scripts/xmppdaemon.php | 16 |
3 files changed, 19 insertions, 1 deletions
diff --git a/classes/Fave.php b/classes/Fave.php index f4cf6256f..c3ec62dcf 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -42,7 +42,7 @@ class Fave extends Memcached_DataObject $ids = Notice::stream(array('Fave', '_streamDirect'), array($user_id, $own), ($own) ? 'fave:ids_by_user_own:'.$user_id : - 'fave:by_user:'.$user_id, + 'fave:ids_by_user:'.$user_id, $offset, $limit); return $ids; } diff --git a/classes/User.php b/classes/User.php index 62a3f8a66..04b38a0d2 100644 --- a/classes/User.php +++ b/classes/User.php @@ -491,6 +491,8 @@ class User extends Memcached_DataObject // ;last cache, too $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id)); $cache->delete(common_cache_key('fave:ids_by_user:'.$this->id.';last')); + $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id)); + $cache->delete(common_cache_key('fave:ids_by_user_own:'.$this->id.';last')); } } diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php index ca6218120..bd1918ca9 100755 --- a/scripts/xmppdaemon.php +++ b/scripts/xmppdaemon.php @@ -116,6 +116,11 @@ class XMPPDaemon extends Daemon $this->conn->processUntil('session_start'); $this->log(LOG_DEBUG, "Sending reconnection presence."); $this->conn->presence('Send me a message to post a notice', 'available', null, 'available', 100); + unset($pl['xml']); + $pl['xml'] = null; + + $pl = null; + unset($pl); } function get_user($from) @@ -189,6 +194,12 @@ class XMPPDaemon extends Daemon $user->free(); unset($user); + + unset($pl['xml']); + $pl['xml'] = null; + + $pl = null; + unset($pl); } function is_self($from) @@ -334,6 +345,11 @@ class XMPPDaemon extends Daemon } break; } + unset($pl['xml']); + $pl['xml'] = null; + + $pl = null; + unset($pl); } function log($level, $msg) |