From 8cf0348e6c9b3dac0a14356676dec93a24b2dad6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 29 Dec 2009 11:36:52 -0800
Subject: Make sure that we have the mbstring extension.

---
 installer/installer.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'installer/installer.php')

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.";
   }
 
-- 
cgit v1.2.3