diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-08-31 00:04:16 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-09-03 17:50:28 -0400 |
commit | b05ab5fc85b320430be9cfe10bf76701c75fc903 (patch) | |
tree | 6d4f0444623555d96cee24a6ef38aa0f62a2ecbe /plugins/Xmpp | |
parent | 764e0ab962018f41db6549393e98a64a7fe12a04 (diff) |
daemon_screenname -> daemonScreenname
Diffstat (limited to 'plugins/Xmpp')
-rw-r--r-- | plugins/Xmpp/XmppPlugin.php | 2 | ||||
-rw-r--r-- | plugins/Xmpp/xmppmanager.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php index 2cdc3272d..321496e7d 100644 --- a/plugins/Xmpp/XmppPlugin.php +++ b/plugins/Xmpp/XmppPlugin.php @@ -254,7 +254,7 @@ class XmppPlugin extends ImPlugin return false; } - function daemon_screenname() + function daemonScreenname() { $ret = $this->user . '@' . $this->server; if($this->resource) diff --git a/plugins/Xmpp/xmppmanager.php b/plugins/Xmpp/xmppmanager.php index 87d818668..c9cb49dd1 100644 --- a/plugins/Xmpp/xmppmanager.php +++ b/plugins/Xmpp/xmppmanager.php @@ -184,7 +184,7 @@ class XmppManager extends ImManager } common_log(LOG_DEBUG, "Sending ping #{$this->pingid}"); - $this->conn->send("<iq from='{" . $this->plugin->daemon_screenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>"); + $this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>"); $this->lastping = $now; return true; } |