diff options
| author | Brion Vibber <brion@pobox.com> | 2010-01-15 09:52:50 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-01-15 09:52:50 -0800 |
| commit | ef016dca45b17e7a9e8aae17ffe1b5caf0e2694c (patch) | |
| tree | 3fe3b0a03aa1034d03618167432481f321804138 /lib/xmppmanager.php | |
| parent | a27aef92060277120f8889136ed6972f5915709f (diff) | |
| parent | 038287c1ffb71207f8028014f20005483364956d (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/xmppmanager.php')
| -rw-r--r-- | lib/xmppmanager.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/xmppmanager.php b/lib/xmppmanager.php index 0839cda57..dfff63a30 100644 --- a/lib/xmppmanager.php +++ b/lib/xmppmanager.php @@ -118,7 +118,11 @@ class XmppManager extends IoManager */ public function getSockets() { - return array($this->conn->getSocket()); + if ($this->conn) { + return array($this->conn->getSocket()); + } else { + return array(); + } } /** |