From 16c9ce2907819c8774dd0e7b8e215a43818a6cf1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 23 Jan 2015 11:51:49 -0500 Subject: [PATCH] Bug Undefined index central_columnswork Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/tbl_columns_definition_form.lib.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 50d60c7785..9363afb459 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,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 bddbbdef0f..ea437a0bc1 100644 --- a/libraries/tbl_columns_definition_form.lib.php +++ b/libraries/tbl_columns_definition_form.lib.php @@ -604,7 +604,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 .= '