diff --git a/ChangeLog b/ChangeLog index 5edcfc78e4..50d60c7785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,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 index a93f1d26b2..1162c968fd 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -1014,11 +1014,11 @@ class PMA_DatabaseInterface // 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;