Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/central_columns.lib.php')
-rw-r--r--libraries/central_columns.lib.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index eee9e23342..542d4b2a6e 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -30,8 +30,8 @@ function PMA_centralColumnsGetParams()
) {
$cfgCentralColumns = array(
'user' => $GLOBALS['cfg']['Server']['user'],
- 'db' => $GLOBALS['cfg']['Server']['pmadb'],
- 'table' => $GLOBALS['cfg']['Server']['central_columns'],
+ 'db' => $cfgRelation['db'],
+ 'table' => $cfgRelation['central_columns'],
);
} else {
$cfgCentralColumns = false;
@@ -57,9 +57,9 @@ function PMA_getColumnsList($db, $from=0, $num=25)
if (empty($cfgCentralColumns)) {
return array();
}
- $pmadb = $GLOBALS['cfg']['Server']['pmadb'];
+ $pmadb = $cfgCentralColumns['db'];
$GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
- $central_list_table = $GLOBALS['cfg']['Server']['central_columns'];
+ $central_list_table = $cfgCentralColumns['table'];
//get current values of $db from central column list
if ($num == 0) {
$query = 'SELECT * FROM ' . PMA_Util::backquote($central_list_table) . ' '