Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-10 02:31:09 +01:00
commit b0805be729

View File

@ -90,7 +90,7 @@ function PMA_getCentralColumnsCount($db)
return 0;
}
$pmadb = $cfgCentralColumns['db'];
$GLOBALS['dbi']->selectDb($pmadb);
$GLOBALS['dbi']->selectDb($pmadb, $GLOBALS['controllink']);
$central_list_table = $cfgCentralColumns['table'];
$query = 'SELECT count(db_name) FROM ' .
PMA_Util::backquote($central_list_table) . ' '