diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 | 
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-01-03 15:51:24 +0000 | 
| commit | 399abbc3a754cf5fdcfdff113446e1bc264091e2 (patch) | |
| tree | 592188568e15325d59e51bf19cfdf667fae8d86d /installer/installer.php | |
| parent | 925a6a2220760cb7daacee1ab80a07b61b3a30a1 (diff) | |
| parent | 64e5efd57ba1479179c202e1b76b6eeb42d2924c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'installer/installer.php')
| -rw-r--r-- | installer/installer.php | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/installer/installer.php b/installer/installer.php index 3b1716e2..e2c60d46 100644 --- a/installer/installer.php +++ b/installer/installer.php @@ -210,7 +210,9 @@ class installer {      $errors[] = "PHP is missing the <a href=\"http://php.net/simplexml\">SimpleXML extension</a>";    } -  if (extension_loaded("mbstring") && (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING)) { +  if (!extension_loaded("mbstring")) { +    $errors[] = "PHP is missing the <a href=\"http://php.net/mbstring\">mbstring extension</a>"; +  } else if (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING) {      $errors[] = "The <a href=\"http://php.net/mbstring\">mbstring extension</a> is overloading PHP's native string functions.  Please disable it.";    } | 
