Merge branch 'QA_4_3'

2014-12-23 19:14:43 +05:30 · 2014-12-23 19:14:43 +05:30 · 3be2f44e3a
commit 3be2f44e3a
parent fdac93897a b9cb88c5fc
1 changed files with 1 additions and 1 deletions
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@ -848,7 +848,7 @@ function PMA_getCentralColumnsListRaw($db, $table)
 {
    $cfgCentralColumns = PMA_centralColumnsGetParams();
    if (empty($cfgCentralColumns)) {
-        return array();
+        return json_encode(array());
    }
    $centralTable = $cfgCentralColumns['table'];
    if (empty($table) || $table == '') {