Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -31,6 +31,9 @@ phpMyAdmin - ChangeLog
 + rfe #1385 Hide tables, functions, procedures, events and views in navigation tree
 + rfe #1321 Export view as if it was a table
 
+4.0.6.0 (not yet released)
+- bug #4036 Call to undefined function mb_detect_encoding (clarify the doc)
+
 4.0.5.0 (not yet released)
 - bug #3977 Not detected configuration storage
 - bug #3970 Pressing enter in the filter field reloads page

doc/require.rst

@@ -13,13 +13,10 @@ PHP
 ---
 
 * You need PHP 5.3.0 or newer, with ``session`` support, the Standard PHP Library 
-  (SPL) extension and JSON support.
+  (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
 
 * To support uploading of ZIP files, you need the PHP ``zip`` extension.
 
-* For proper support of multibyte strings (eg. UTF-8, which is currently
-  the default), you should install the ``mbstring`` and ``ctype`` extensions.
-
 * You need GD2 support in PHP to display inline thumbnails of JPEGs
   ("image/jpeg: inline") with their original aspect ratio.
 

libraries/engines/bdb.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/berkeleydb.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * Load BDB class.
  */

libraries/engines/binlog.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/innobase.lib.php

@@ -8,6 +8,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */

libraries/engines/innodb.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The InnoDB storage engine
  *

libraries/engines/memory.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MEMORY (HEAP) storage engine
  *

libraries/engines/merge.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MERGE storage engine
  *

libraries/engines/mrg_myisam.lib.php

@@ -7,6 +7,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  *
  */

libraries/engines/myisam.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The MyISAM storage engine
  *

libraries/engines/ndbcluster.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The NDBCLUSTER storage engine
  *

libraries/engines/pbxt.lib.php

@@ -9,6 +9,10 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * The PBXT storage engine
  *