summaryrefslogtreecommitdiff
path: root/inc/infoutils.php
diff options
context:
space:
mode:
authorChristopher Smith <chris@jalakai.co.uk>2014-03-02 21:00:08 +0000
committerChristopher Smith <chris@jalakai.co.uk>2014-03-02 21:00:08 +0000
commitf327a5f0a9ef72e6dd79d9d200f81c330aa4903c (patch)
tree2d2a398218964e3bee0876385f9c8786a3baf8de /inc/infoutils.php
parent446b5b5934799f1f906ea8903b1e96c981f1c1b2 (diff)
parent709fd92548efedbd4b4e5693097165d1dff072e4 (diff)
downloadrpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.gz
rpg-f327a5f0a9ef72e6dd79d9d200f81c330aa4903c.tar.bz2
Merge branch 'master' into FS#2388
Diffstat (limited to 'inc/infoutils.php')
-rw-r--r--inc/infoutils.php14
1 files changed, 9 insertions, 5 deletions
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 7358955a0..3636d86a1 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -105,12 +105,16 @@ function check(){
if ($INFO['isadmin'] || $INFO['ismanager']){
msg('DokuWiki version: '.getVersion(),1);
- }
- if(version_compare(phpversion(),'5.2.0','<')){
- msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ needed)',-1);
- }else{
- msg('PHP version '.phpversion(),1);
+ if(version_compare(phpversion(),'5.2.0','<')){
+ msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ needed)',-1);
+ }else{
+ msg('PHP version '.phpversion(),1);
+ }
+ } else {
+ if(version_compare(phpversion(),'5.2.0','<')){
+ msg('Your PHP version is too old',-1);
+ }
}
$mem = (int) php_to_byte(ini_get('memory_limit'));