MDL-9796 fixed error array when environment file broken; merged from MOODLE_19_STABLE

diff --git a/lib/environmentlib.php b/lib/environmentlib.php
index aa30ec7b699cc4b9aa8d7ea2eb34fe4fedeecf7d..836c1c4bec7da477eece67109da92af60048180b 100644 (file)
--- a/lib/environmentlib.php
+++ b/lib/environmentlib.php
@@ -488,7 +488,7 @@ function environment_check_php_extensions($version) {
         $result = new environment_results('php_extension');
         $result->setStatus(false);
         $result->setErrorCode(NO_VERSION_DATA_FOUND);
-        return $result;
+        return array($result);
     }
 
 /// Extract the php_extension part
@@ -497,7 +497,7 @@ function environment_check_php_extensions($version) {
         $result = new environment_results('php_extension');
         $result->setStatus(false);
         $result->setErrorCode(NO_PHP_EXTENSIONS_SECTION_FOUND);
-        return $result;
+        return array($result);
     }
 /// Iterate over extensions checking them and creating the needed environment_results
     foreach($data['#']['PHP_EXTENSIONS']['0']['#']['PHP_EXTENSION'] as $extension) {