Merge branch 'xmpphp-fix' into 'master'

[quix0rs-gnu-social.git] / plugins / Xmpp / extlib / XMPPHP / Roster.php

diff --git a/plugins/Xmpp/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php
index 2e459e2a2f672182f632ed184d3689790cecc908..69457b22a195454a27a093673129c92ebcab7917 100644 (file)
--- a/plugins/Xmpp/extlib/XMPPHP/Roster.php
+++ b/plugins/Xmpp/extlib/XMPPHP/Roster.php
@@ -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);
                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);
                $jid = $split[0];
                if($this->isContact($jid)) {
                        $current = array('resource' => '', 'active' => '', 'priority' => -129, 'show' => '', 'status' => ''); //Priorities can only be -128 = 127