diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-16 09:25:09 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-16 09:25:09 -0800 |
commit | d5cbfe8071d56438cfa168dc3db56a959317eae0 (patch) | |
tree | c00ca6c3e0d1bd2fb9b05a515c337b6afce3a070 /lib/xmppmanager.php | |
parent | d4f6235d7b8a40bd1b51370e7eb405cdb14e61fb (diff) | |
parent | 81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
lib/iomaster.php
Diffstat (limited to 'lib/xmppmanager.php')
-rw-r--r-- | lib/xmppmanager.php | 8 |
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); } } } |