Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

phpmyadmin · Sep 24, 2013 · d8b4658 · d8b4658
2 parents 2639a5b + 256fcb6
commit d8b4658
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog
 - bug #4060 Browser tries to remember wrong password when creating new user
 - bug #4002 Edit Index on big table doesn't show "Loading" or any message
 - bug #4098 Default table tab is ignored
+- bug #4099 Server/library difference warning: setting is ignored
 
 4.0.7.0 (2013-09-23)
 - bug #3993 Sorting in database overview with statistics doesn't work

diff --git a/index.php b/index.php
@@ -493,7 +493,10 @@
  * Drizzle can speak MySQL protocol, so don't warn about version mismatch for
  * Drizzle servers.
  */
-if (function_exists('PMA_DBI_get_client_info') && !PMA_DRIZZLE) {
+if (function_exists('PMA_DBI_get_client_info')
+    && !PMA_DRIZZLE
+    && $cfg['ServerLibraryDifference_DisableWarning'] == false
+) {
     $_client_info = PMA_DBI_get_client_info();
     if ($server > 0
         && strpos($_client_info, 'mysqlnd') === false