Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-02-07 14:49:19 +01:00
commit e0a085be6c

View File

@ -361,7 +361,7 @@ class Node_Database extends Node
// Remove hidden items so that they are not displayed in navigation tree
$cfgRelation = PMA_getRelationsParam();
if ($cfgRelation['navwork']) {
if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
$navTable = PMA_Util::backquote($cfgRelation['db'])
. "." . PMA_Util::backquote($cfgRelation['navigationhiding']);
$sqlQuery = "SELECT `item_name` FROM " . $navTable