Merge branch 'xmpp-fix-1' into 'nightly'

Fix 'from' address in the XMPP ping command

See merge request !141
This commit is contained in:
mmn 2017-07-11 19:18:51 +00:00
commit d564e28f8e
1 changed files with 1 additions and 1 deletions

View File

@ -183,7 +183,7 @@ class XmppManager extends ImManager
}
common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
$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->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;
}