Merge branch 'QA_4_3'

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Jan 23, 2015 · d0e39b7 · d0e39b7
2 parents 750bfbb + 2eab3b5
commit d0e39b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -35,6 +35,7 @@ phpMyAdmin - ChangeLog
 - bug #4716 Collapse all in navigation panel is sometimes broken
 - bug #4724 Cannot navigate in filtered table list
 - bug #4717 Database navigation menu broken when resolution/screen is changing
+- bug #4727 Collation column missing in database list when DisableIS is true
 
 4.3.7.0 (2015-01-15)
 - bug #4694 js error on marking table as favorite in Safari (in private mode)

diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php
@@ -1014,11 +1014,11 @@ public function getDatabasesFull($database = null, $force_stats = false,
                 // MySQL 5.0 or higher is required for current PMA version
                 $databases[$database_name]['SCHEMA_NAME']      = $database_name;
 
-                if ($force_stats) {
-                    include_once './libraries/mysql_charsets.inc.php';
+                include_once './libraries/mysql_charsets.inc.php';
+                $databases[$database_name]['DEFAULT_COLLATION_NAME']
+                    = PMA_getDbCollation($database_name);
 
-                    $databases[$database_name]['DEFAULT_COLLATION_NAME']
-                        = PMA_getDbCollation($database_name);
+                if ($force_stats) {
 
                     // get additional info about tables
                     $databases[$database_name]['SCHEMA_TABLES']          = 0;