diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-02 13:38:10 -0800 |
commit | ddf3614c843bcd8d9ecfd0850ac9a8cefae6dbba (patch) | |
tree | 07b772b280e6f23761c0111d953b3c2f5b8d2120 /plugins/OStatus/classes/HubSub.php | |
parent | 8629664ed90ffb496f607d15491821217f6b3126 (diff) | |
parent | e9c127ddd869f44eafe7ae6b30d9dc69df8b863c (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/OStatus/classes/HubSub.php')
-rw-r--r-- | plugins/OStatus/classes/HubSub.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php index e599d83a9..3120a70f9 100644 --- a/plugins/OStatus/classes/HubSub.php +++ b/plugins/OStatus/classes/HubSub.php @@ -260,9 +260,15 @@ class HubSub extends Memcached_DataObject $retries = intval(common_config('ostatus', 'hub_retries')); } - $data = array('sub' => clone($this), + // We dare not clone() as when the clone is discarded it'll + // destroy the result data for the parent query. + // @fixme use clone() again when it's safe to copy an + // individual item from a multi-item query again. + $sub = HubSub::staticGet($this->topic, $this->callback); + $data = array('sub' => $sub, 'atom' => $atom, 'retries' => $retries); + common_log(LOG_INFO, "Queuing PuSH: $this->topic to $this->callback"); $qm = QueueManager::get(); $qm->enqueue($data, 'hubout'); } |