diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-29 15:48:40 -0800 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-12-29 15:48:40 -0800 |
commit | 373dcf0a424ae27388ccf5bfa55f54f9d896778a (patch) | |
tree | 7785edbb77384f7fa13d61139483c37a0e10764d | |
parent | 41969cc9e454637f6e3a04b0e339942cbb140cf6 (diff) | |
parent | f6adcfe054a37afde734d672f9ad2f75c05c0df2 (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
-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."; } |