Merge branch 'QA_4_3'

2015-01-23 11:52:24 -05:00 · 2015-01-23 11:52:24 -05:00 · b46c42bcf2
commit b46c42bcf2
parent c5580d3319 16c9ce2907
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -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)
--- 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 .=  '<p style="font-size:80%;margin:5px 2px" '