Merge branch 'MDL-66483_36' of git://github.com/stronk7/moodle into MOODLE_36_STABLE

lib/xmlize.php

@@ -39,9 +39,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-// Add setuplib in case it has not been loaded yet as it's required by \xml_format_exception.
-require_once($CFG->libdir.'/setuplib.php');
-
 class xml_format_exception extends moodle_exception {
     /** @var string */
     public $errorstring;

mod/glossary/lib.php

@@ -2438,8 +2438,8 @@ function glossary_generate_export_file($glossary, $ignored = "", $hook = 0) {
  * @return string
  */
 function glossary_read_imported_file($file_content) {
-    require_once "../../lib/xmlize.php";
     global $CFG;
+    require_once "../../lib/xmlize.php";
 
     return xmlize($file_content, 0);
 }