Merge branch 'MDL-64223-35' of https://github.com/snake/moodle into MOODLE_35_STABLE

This commit is contained in:
Jun Pataleta
2018-11-28 13:59:35 +08:00
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -126,11 +126,11 @@ class XMPPHP_XMLStream {
/**
* @var string
*/
protected $until = '';
protected $until = [];
/**
* @var string
*/
protected $until_count = '';
protected $until_count = [];
/**
* @var array
*/
+1
View 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