Merge branch 'master' of git://github.com/Drarok/xmpphp
This commit is contained in:
commit
28ab9981ae
@ -118,7 +118,7 @@ class Roster {
|
||||
* @param string $status
|
||||
*/
|
||||
public function setPresence($presence, $priority, $show, $status) {
|
||||
list($jid, $resource) = split("/", $presence);
|
||||
list($jid, $resource) = explode('/', $presence, 2);
|
||||
if ($show != 'unavailable') {
|
||||
if (!$this->isContact($jid)) {
|
||||
$this->addContact($jid, 'not-in-roster');
|
||||
@ -137,7 +137,7 @@ class Roster {
|
||||
* @param string $jid
|
||||
*/
|
||||
public function getPresence($jid) {
|
||||
$split = split("/", $jid);
|
||||
$split = explode('/', $jid, 2);
|
||||
$jid = $split[0];
|
||||
if($this->isContact($jid)) {
|
||||
$current = array('resource' => '', 'active' => '', 'priority' => -129, 'show' => '', 'status' => ''); //Priorities can only be -128 = 127
|
||||
|
@ -263,7 +263,7 @@ class XMPPHP_XMLStream {
|
||||
$ns_tags = array($xpath);
|
||||
}
|
||||
foreach($ns_tags as $ns_tag) {
|
||||
list($l, $r) = split("}", $ns_tag);
|
||||
list($l, $r) = explode('}', $ns_tag);
|
||||
if ($r != null) {
|
||||
$xpart = array(substr($l, 1), $r);
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user