From 0fd23b76de49d0cc4928e15a2c53fd295c3f4406 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sun, 7 Apr 2013 18:32:15 +0200 Subject: [PATCH] MDL-39006 environment: raise all uses of 5.3.2 to 5.3.3 --- admin/cli/install.php | 4 ++-- admin/cli/install_database.php | 4 ++-- admin/index.php | 4 ++-- install.php | 8 ++++---- lib/setup.php | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/admin/cli/install.php b/admin/cli/install.php index ca8aaef07bc..35db018fd7f 100644 --- a/admin/cli/install.php +++ b/admin/cli/install.php @@ -131,10 +131,10 @@ define('MOODLE_INTERNAL', true); define('CACHE_DISABLE_ALL', true); // Check that PHP is of a sufficient version -if (version_compare(phpversion(), "5.3.2") < 0) { +if (version_compare(phpversion(), "5.3.3") < 0) { $phpversion = phpversion(); // do NOT localise - lang strings would not work here and we CAN NOT move it after installib - fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n"); + fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n"); fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n"); exit(1); } diff --git a/admin/cli/install_database.php b/admin/cli/install_database.php index 313f3521d40..27a38aab42c 100644 --- a/admin/cli/install_database.php +++ b/admin/cli/install_database.php @@ -55,10 +55,10 @@ Example: "; // Check that PHP is of a sufficient version -if (version_compare(phpversion(), "5.3.2") < 0) { +if (version_compare(phpversion(), "5.3.3") < 0) { $phpversion = phpversion(); // do NOT localise - lang strings would not work here and we CAN NOT move it after installib - fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n"); + fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n"); fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n"); exit(1); } diff --git a/admin/index.php b/admin/index.php index def20d29ecd..9c1a9132400 100644 --- a/admin/index.php +++ b/admin/index.php @@ -30,10 +30,10 @@ if (!file_exists('../config.php')) { } // Check that PHP is of a sufficient version as soon as possible -if (version_compare(phpversion(), '5.3.2') < 0) { +if (version_compare(phpversion(), '5.3.3') < 0) { $phpversion = phpversion(); // do NOT localise - lang strings would not work here and we CAN NOT move it to later place - echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).
"; + echo "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).
"; echo "Please upgrade your server software or install older Moodle version."; die(); } diff --git a/install.php b/install.php index 8c5bcf746fb..96e626966fb 100644 --- a/install.php +++ b/install.php @@ -58,10 +58,10 @@ if (function_exists('date_default_timezone_set') and function_exists('date_defau @ini_set('display_errors', '1'); // Check that PHP is of a sufficient version. -if (version_compare(phpversion(), '5.3.2') < 0) { +if (version_compare(phpversion(), '5.3.3') < 0) { $phpversion = phpversion(); // do NOT localise - lang strings would not work here and we CAN not move it after installib - echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).
"; + echo "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).
"; echo "Please upgrade your server software or install older Moodle version."; die; } @@ -490,7 +490,7 @@ if ($config->stage == INSTALL_DATABASETYPE) { if ($config->stage == INSTALL_ENVIRONMENT or $config->stage == INSTALL_PATHS) { - $version_fail = (version_compare(phpversion(), "5.3.2") < 0); + $version_fail = (version_compare(phpversion(), "5.3.3") < 0); $curl_fail = ($lang !== 'en' and !extension_loaded('curl')); // needed for lang pack download $zip_fail = ($lang !== 'en' and !extension_loaded('zip')); // needed for lang pack download @@ -503,7 +503,7 @@ if ($config->stage == INSTALL_ENVIRONMENT or $config->stage == INSTALL_PATHS) { echo '
'; if ($version_fail) { - $a = (object)array('needed'=>'5.3.2', 'current'=>phpversion()); + $a = (object)array('needed'=>'5.3.3', 'current'=>phpversion()); echo '
'.get_string('phpversion', 'install').'
'.get_string('environmentrequireversion', 'admin', $a).'
'; } if ($curl_fail) { diff --git a/lib/setup.php b/lib/setup.php index 00721c6151a..5524a79873d 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -251,10 +251,10 @@ 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.3.2') < 0) { + if (version_compare(phpversion(), '5.3.3') < 0) { $phpversion = phpversion(); // do NOT localise - lang strings would not work here and we CAN NOT move it to later place - echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n"; + echo "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n"; echo "Some servers may have multiple PHP versions installed, are you using the correct executable?\n"; exit(1); }