MDL-15410 Require PHP 5.2.4 instead of 5.2.0 in HEAD because PHP 5.2.0 has many known...

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index 2def6b953f7e81707ebbfd43e4017b1e1235a47a..b4cb4642d3ff1bede075313897ebdc55dc6fd7cc 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -659,9 +659,9 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
 
     /// Check that PHP is of a sufficient version
     /// Moved here because older versions do not allow while(@ob_end_clean());
-    if (version_compare(phpversion(), "5.2.0") < 0) {
+    if (version_compare(phpversion(), "5.2.4") < 0) {
         $phpversion = phpversion();
-        console_write(STDERR,"Sorry, Moodle requires PHP 5.2.0 or later (currently using version $phpversion)",'',false);
+        console_write(STDERR,"Sorry, Moodle requires PHP 5.2.4 or later (currently using version $phpversion)",'',false);
     }
     /// Turn off time limits and try to flush everything all the time, sometimes upgrades can be slow.
 

diff --git a/admin/environment.xml b/admin/environment.xml
index 721f103ab20f1208981cadf8bcba5f384637a60a..e67c9e0b67cd50c68bcc2631e3067172b4ccad65 100644 (file)
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -216,7 +216,7 @@
       <VENDOR name="oracle" version="9.0" />
       <VENDOR name="sqlite" version="2.0" />
     </DATABASE>
-    <PHP version="5.2.0" level="required">
+    <PHP version="5.2.4" level="required">
     </PHP>
     <PHP_EXTENSIONS>
       <PHP_EXTENSION name="iconv" level="optional">

diff --git a/admin/index.php b/admin/index.php
index 63d37d3c4ebb3165f26fb6d23d279794f7a14135..2630f07f0b7a1b4e737cdd3b227a7aed6032302a 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -8,9 +8,9 @@
 
 /// Check that PHP is of a sufficient version
 /// Moved here because older versions do not allow while(@ob_end_clean());
-    if (version_compare(phpversion(), "5.2.0") < 0) {
+    if (version_compare(phpversion(), "5.2.4") < 0) {
         $phpversion = phpversion();
-        echo "Sorry, Moodle requires PHP 5.2.0 or later (currently using version $phpversion)";
+        echo "Sorry, Moodle requires PHP 5.2.4 or later (currently using version $phpversion)";
         die;
     }
 

diff --git a/lang/en_utf8/install.php b/lang/en_utf8/install.php
index 96b7f0bdafd0e0e2654b4b3b124f19d746579198..caf26ca903fd12463362ce930ce1a815ce28937c 100644 (file)
--- a/lang/en_utf8/install.php
+++ b/lang/en_utf8/install.php
@@ -300,8 +300,8 @@ $string['odbc_mssql'] = 'SQL*Server over ODBC (odbc_mssql)';
 $string['odbcextensionisnotpresentinphp'] = 'PHP has not been properly configured with the ODBC extension so that it can communicate with SQL*Server.  Please check your php.ini file or recompile PHP.';
 $string['pass'] = 'Pass';
 $string['pgsqlextensionisnotpresentinphp'] = 'PHP has not been properly configured with the PGSQL extension so that it can communicate with PostgreSQL.  Please check your php.ini file or recompile PHP.';
-$string['php52versionerror'] = 'PHP version must be at least 5.2.0.';
-$string['php52versionhelp'] = '<p>Moodle requires a PHP version of at least 5.2.0.</p>
+$string['php52versionerror'] = 'PHP version must be at least 5.2.4.';
+$string['php52versionhelp'] = '<p>Moodle requires a PHP version of at least 5.2.4.</p>
 <p>You are currently running version $a</p>
 <p>You must upgrade PHP or move to a host with a newer version of PHP!</p>';
 $string['phpversion'] = 'PHP version';

diff --git a/lib/installlib.php b/lib/installlib.php
index d342861da45febf7ee10f21af0119058d7ec0d29..04ef1cdbe018298f06b9419471dc4b3ea640a700 100644 (file)
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -77,5 +77,5 @@ function check_memory_limit() {
  * @return boolean
  */
 function inst_check_php_version() {
-    return check_php_version("5.2.0");
+    return check_php_version("5.2.4");
 }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 1f05e8f464e6450b08fa7fd50e3bf77ae5ae72e2..3c8fe40f0cb5e94eba9b67aa4ac2b4653eca9d19 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6071,7 +6071,7 @@ function plugin_supports($type,$name,$feature) {
  * @param string $version The version of php being tested.
  * @return bool
  */
-function check_php_version($version='5.2.0') {
+function check_php_version($version='5.2.4') {
     return (version_compare(phpversion(), $version) >= 0);
 }