Merge branch 'MDL-57163_master' of git://github.com/dmonllao/moodle

moodle · Nov 29, 2016 · 8b516a6 · 8b516a6
2 parents dc3e3c0 + 4a1165b
commit 8b516a6
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
@@ -2333,6 +2333,12 @@ function check_unoconv_version(environment_results $result) {
 function check_tls_libraries(environment_results $result) {
     global $CFG;
 
+    if (!function_exists('curl_version')) {
+        $result->setInfo('cURL PHP extension is not installed');
+        $result->setStatus(false);
+        return $result;
+    }
+
     if (!\core\upgrade\util::validate_php_curl_tls(curl_version(), PHP_ZTS)) {
         $result->setInfo('invalid ssl/tls configuration');
         $result->setStatus(false);
@@ -2356,6 +2362,12 @@ function check_tls_libraries(environment_results $result) {
  */
 function check_libcurl_version(environment_results $result) {
 
+    if (!function_exists('curl_version')) {
+        $result->setInfo('cURL PHP extension is not installed');
+        $result->setStatus(false);
+        return $result;
+    }
+
     // Supported version and version number.
     $supportedversion = 0x071304;
     $supportedversionstring = "7.19.4";