diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-16 06:57:01 -0800 |
| commit | 42550321ffd40328efa8b3bd8ec627ae219cf005 (patch) | |
| tree | 7556abe8a8d6416b34541e01d098f21959e34b4c /lib/xmppmanager.php | |
| parent | 23a8645a394e2e27997638d03801aab380b84420 (diff) | |
| parent | 1ef8efe4c5624e7df38ce66187719038594cd828 (diff) | |
Merge branch '0.9.x' of git@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(); + } } /** |