Merge branch 'MDL-56167-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
David Monllao 2016-10-03 11:04:34 +08:00
commit 92e3294dfc

View File

@ -338,15 +338,13 @@ if (file_exists("$CFG->dataroot/climaintenance.html")) {
}
}
if (CLI_SCRIPT) {
// sometimes people use different PHP binary for web and CLI, make 100% sure they have the supported PHP version
if (version_compare(phpversion(), '5.6.5') < 0) {
$phpversion = phpversion();
// do NOT localise - lang strings would not work here and we CAN NOT move it to later place
echo "Moodle 3.2 or later requires at least PHP 5.6.5 (currently using version $phpversion).\n";
echo "Some servers may have multiple PHP versions installed, are you using the correct executable?\n";
exit(1);
}
// Sometimes people use different PHP binary for web and CLI, make 100% sure they have the supported PHP version.
if (version_compare(PHP_VERSION, '5.6.5') < 0) {
$phpversion = PHP_VERSION;
// Do NOT localise - lang strings would not work here and we CAN NOT move it to later place.
echo "Moodle 3.2 or later requires at least PHP 5.6.5 (currently using version $phpversion).\n";
echo "Some servers may have multiple PHP versions installed, are you using the correct executable?\n";
exit(1);
}
// Detect ajax scripts - they are similar to CLI because we can not redirect, output html, etc.