diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-16 07:48:59 -0800 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-16 07:48:59 -0800 |
| commit | 21c3e08804b312aaea21ae6bd0a0691304d6e4cd (patch) | |
| tree | 9a950feabe17cd52e241eddf06d61409a190bba6 /lib/xmppmanager.php | |
| parent | d6b8b13116b9a2de5d745487277551b281796975 (diff) | |
| parent | 598072468c9fdb07df2cda9da207f123b14566ae (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
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(); + } } /** |