diff --git a/ChangeLog b/ChangeLog index 7aacfb5f0a..0d2eb98c9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ phpMyAdmin - ChangeLog - 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 +- bug Undefined index central_columnswork 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/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php index 5e1a533750..1d1b94b39f 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -602,7 +602,9 @@ function PMA_getHtmlForColumnName( . (isset($columnMeta['Field']) ? htmlspecialchars($columnMeta['Field']) : '') . '"' . ' />'; - if ($cfgRelation['central_columnswork'] && !(isset($columnMeta['column_status']) + if (isset($cfgRelation['central_columnswork']) + && $cfgRelation['central_columnswork'] + && !(isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable']) ) { $html .= '