gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-03-09 11:37:06 +01:00
commit cd69422729
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/central_columns.lib.php
View File

@ -894,8 +894,11 @@ function PMA_getCentralColumnsListRaw($db, $table)
}
$cols = trim($cols, ',');
$query = 'SELECT * FROM ' . PMA_Util::backquote($centralTable) . ' '
. 'WHERE db_name = \'' . $db . '\' '
. 'AND col_name NOT IN (' . $cols . ');';
. 'WHERE db_name = \'' . $db . '\'';
if ($cols) {
$query .= ' AND col_name NOT IN (' . $cols . ')';
}
$query .= ';';
}
$GLOBALS['dbi']->selectDb($cfgCentralColumns['db'], $GLOBALS['controllink']);
$columns_list = (array)$GLOBALS['dbi']->fetchResult(