mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Monllao 2016-10-03 11:04:34 +08:00
commit 92e3294dfc
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/setup.php
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.
// 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) {
if (version_compare(phpversion(), '5.6.5') < 0) { $phpversion = PHP_VERSION;
$phpversion = phpversion(); // Do NOT localise - lang strings would not work here and we CAN NOT move it to later place.
// 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 "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";
echo "Some servers may have multiple PHP versions installed, are you using the correct executable?\n"; exit(1);
exit(1);
}
} }
// Detect ajax scripts - they are similar to CLI because we can not redirect, output html, etc. // Detect ajax scripts - they are similar to CLI because we can not redirect, output html, etc.