Merge branch 'MDL-64223-master' of https://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 28 Nov 2018 05:59:50 +0000 (13:59 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 28 Nov 2018 05:59:50 +0000 (13:59 +0800)
lib/jabber/XMPP/XMLStream.php
lib/jabber/readme_moodle.txt

index 5c71426..41c7a78 100644 (file)
@@ -126,11 +126,11 @@ class XMPPHP_XMLStream {
        /**
         * @var string
         */
-       protected $until = '';
+       protected $until = [];
        /**
         * @var string
         */
-       protected $until_count = '';
+       protected $until_count = [];
        /**
         * @var array
         */
index 205c214..38e0bbd 100644 (file)
@@ -2,3 +2,4 @@ Description of XMPPHP (aka jabber) version 0.1rc2-r77 library import into Moodle
 
 MDL-20876 - replaced deprecated split() with explode()
 MDL-52335 - PHP7 variable syntax changes
+MDL-64223 - PHP7.1 compatibility changes