From f0232c3cda257510a3214098421527c3c663c5c2 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 24 Jun 2013 07:58:23 -0400
Subject: [PATCH] bug #3985 Call to undefined function mb_detect_encoding

---
 ChangeLog                | 1 +
 libraries/common.inc.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f166942a8e..aef519ec43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3984 Cannot insert in this table (PHP < 5.4)
 - bug #3989 Reloading privileges does not update the interface
 - bug #3960 NavigationBarIconic config not honored
+- bug #3985 Call to undefined function mb_detect_encoding
 
 4.0.4.0 (2013-06-17)
 - bug #3959 Using DefaultTabDatabase in NavigationTree for Database Click
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 85cf8f49ec..6b30d1b648 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -94,6 +94,13 @@ require './libraries/core.lib.php';
  */
 require './libraries/sanitizing.lib.php';
 
+/**
+ * Warning about mbstring.
+ */
+if (! function_exists('mb_detect_encoding')) {
+    PMA_warnMissingExtension('mbstring', $fatal = true);
+}
+
 /**
  * the PMA_Theme class
  */