Permalink
Browse files

Merge branch 'MDL-58746-master' of git://github.com/andrewnicols/moodle

  • Loading branch information...
dmonllao committed May 1, 2017
2 parents 434f31b + 9a2854c commit e4838ca91bd555f09dcd3d47d9caee6fe3452f81
Showing with 23 additions and 0 deletions.
  1. +5 −0 admin/environment.xml
  2. +1 −0 lang/en/admin.php
  3. +17 −0 lib/upgradelib.php
@@ -2078,6 +2078,11 @@
<ON_CHECK message="incompleteunicodesupport" />
</FEEDBACK>
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_finfo" level="required">
<FEEDBACK>
<ON_ERROR message="finforequired" />
</FEEDBACK>
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
@@ -623,6 +623,7 @@
IP address location is displayed on simple map or using Google Maps. Please note that you need to have a Google account and apply for free Google Maps API key to enable interactive maps.';
$string['iplookupmaxmindnote'] = 'This product includes GeoLite2 data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a>.';
$string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. For increased security and improved integrations with other systems is highly recommended to migrate your site to HTTPS.';
$string['finforequired'] = 'The finfo PHP extension is now required by Moodle, in order to improve mimetype decoding.';
$string['keeptagnamecase'] = 'Keep tag name casing';
$string['lang'] = 'Default language';
$string['langcache'] = 'Cache language menu';
@@ -2516,3 +2516,20 @@ function check_libcurl_version(environment_results $result) {
return null;
}
/**
* Check if the finfo class is present.
*
* @param environment_results $result object to update, if relevant.
* @return environment_results|null updated results or null.
*/
function check_finfo(environment_results $result) {
if (!class_exists('finfo')) {
$result->setInfo('finfo extension not enabled');
$result->setStatus(false);
return $result;
}
return null;
}

0 comments on commit e4838ca

Please sign in to comment.