summaryrefslogtreecommitdiff
path: root/lib/xmppmanager.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-16 09:22:02 -0800
committerBrion Vibber <brion@pobox.com>2010-02-16 09:22:02 -0800
commit81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (patch)
tree7dddea4daac884f70d021fb11f1d02d560c0cd10 /lib/xmppmanager.php
parent2e258454f396af9f95092b9564eee08179ff6be1 (diff)
parentc74aea589d5a79d7048470d44e457dffc8919ad3 (diff)
Merge branch 'master' into testing
Conflicts: lib/stompqueuemanager.php
Diffstat (limited to 'lib/xmppmanager.php')
-rw-r--r--lib/xmppmanager.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php
index 985e7c32e..f37635855 100644
--- a/lib/xmppmanager.php
+++ b/lib/xmppmanager.php
@@ -48,7 +48,7 @@ class XmppManager extends IoManager
public static function get()
{
if (common_config('xmpp', 'enabled')) {
- $site = common_config('site', 'server');
+ $site = StatusNet::currentSite();
if (empty(self::$singletons[$site])) {
self::$singletons[$site] = new XmppManager();
}
@@ -69,7 +69,7 @@ class XmppManager extends IoManager
function __construct()
{
- $this->site = common_config('site', 'server');
+ $this->site = StatusNet::currentSite();
$this->resource = common_config('xmpp', 'resource') . 'daemon';
}
@@ -476,10 +476,10 @@ class XmppManager extends IoManager
*/
protected function switchSite()
{
- if ($this->site != common_config('site', 'server')) {
+ if ($this->site != StatusNet::currentSite()) {
common_log(LOG_DEBUG, __METHOD__ . ": switching to site $this->site");
$this->stats('switch');
- StatusNet::init($this->site);
+ StatusNet::switchSite($this->site);
}
}
}