diff options
author | Andreas Gohr <andi@splitbrain.org> | 2009-07-26 13:52:55 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2009-07-26 13:52:55 +0200 |
commit | a6783fdb13cb5cc9b0225cb1ea1ac8c028a775da (patch) | |
tree | dc065c4aaebcc66e57744d8b0060d441ef203c9a | |
parent | 793361f8d644d7597b936a4471753c3b32f288cb (diff) | |
download | rpg-a6783fdb13cb5cc9b0225cb1ea1ac8c028a775da.tar.gz rpg-a6783fdb13cb5cc9b0225cb1ea1ac8c028a775da.tar.bz2 |
Updated version checks for PHP 5
Ignore-this: 97d3d6fd8dc65d0cfce6b976cc2fad28
The next release will require PHP 5, the related checks were upgraded to check
for at least 5.0.0 (we might need to tune this)
darcs-hash:20090726115255-7ad00-59d67b61739db8eea0288a8010d7cdf507ab867b.gz
-rw-r--r-- | inc/infoutils.php | 6 | ||||
-rw-r--r-- | install.php | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/inc/infoutils.php b/inc/infoutils.php index ac59d9488..c2db31f7d 100644 --- a/inc/infoutils.php +++ b/inc/infoutils.php @@ -81,10 +81,8 @@ function check(){ msg('DokuWiki version: '.getVersion(),1); - if(version_compare(phpversion(),'4.3.3','<')){ - msg('Your PHP version is too old ('.phpversion().' vs. 4.3.3+ recommended)',-1); - }elseif(version_compare(phpversion(),'4.3.10','<')){ - msg('Consider upgrading PHP to 4.3.10 or higher for security reasons (your version: '.phpversion().')',0); + if(version_compare(phpversion(),'5.0.0','<')){ + msg('Your PHP version is too old ('.phpversion().' vs. 5.0.0+ recommended)',-1); }else{ msg('PHP version '.phpversion(),1); } diff --git a/install.php b/install.php index 3f031ecd1..07f69f24b 100644 --- a/install.php +++ b/install.php @@ -424,8 +424,8 @@ function check_functions(){ global $lang; $ok = true; - if(version_compare(phpversion(),'4.3.3','<')){ - $error[] = sprintf($lang['i_phpver'],phpversion(),'4.3.3'); + if(version_compare(phpversion(),'5.0.0','<')){ + $error[] = sprintf($lang['i_phpver'],phpversion(),'5.0.0'); $ok = false; } @@ -434,7 +434,7 @@ function check_functions(){ 'glob header ignore_user_abort ini_get mail mkdir '. 'ob_start opendir parse_ini_file readfile realpath '. 'rename rmdir serialize session_start unlink usleep '. - 'preg_replace file_get_contents'); + 'preg_replace file_get_contents htmlspecialchars_decode'); if (!function_exists('mb_substr')) { $funcs[] = 'utf8_encode'; |