Merge branch 'QA_4_3'

2014-12-16 13:33:24 -05:00 · 2014-12-16 13:33:24 -05:00 · 0df0de4717
commit 0df0de4717
parent d63627b5cc 266f4c7bb6
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - bug #4649 Attributes field size smaller than others
 - bug #4622 Cannot remove table ordering on a Mac
 - bug       Fix initial replication configuration
+- bug       Undefined index central_columnswork

 4.3.2.0 (2014-12-12)
 - bug #4628 PHP error while exporting schema as PDF
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@ -25,7 +25,9 @@ function PMA_centralColumnsGetParams()

    $cfgRelation = PMA_getRelationsParam();

-    if ($cfgRelation['central_columnswork']) {
+    if (isset($cfgRelation['central_columnswork'])
+        && $cfgRelation['central_columnswork']
+    ) {
        $cfgCentralColumns = array(
            'user'  => $GLOBALS['cfg']['Server']['user'],
            'db'    => $GLOBALS['cfg']['Server']['pmadb'],