Merge branch 'wip-MDL-57462-master-fix' of git://github.com/abgreeve/moodle

This commit is contained in:
Andrew Nicols 2017-07-12 10:49:59 +08:00
commit bd5416aab5

View file

@ -62,7 +62,7 @@ date_default_timezone_set(@date_default_timezone_get());
@ini_set('display_errors', '1'); @ini_set('display_errors', '1');
// Check that PHP is of a sufficient version as soon as possible. // Check that PHP is of a sufficient version as soon as possible.
require_once(__DIR__.'/../../lib/phpminimumversionlib.php'); require_once(__DIR__.'/lib/phpminimumversionlib.php');
moodle_require_minimum_php_version(); moodle_require_minimum_php_version();
// make sure iconv is available and actually works // make sure iconv is available and actually works