From dc4d694bd48d3ba90d1f5aaef9b352192e4e4ec7 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 10 Oct 2014 11:38:19 +0530 Subject: [PATCH] bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/navigation/NavigationTree.class.php | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4996b8f9b4..7eedad5e20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #4252 Database-level permission bug for db names containing underscores - bug #3120 Events are not exported when using xml - bug #4554 Grid-editing timestamp column forces datepicker +- bug #4556 Fast filters for tables, views etc. should be governed by NavigationTreeDisplayItemFilterMinimum 4.2.9.1 (2014-10-01) - bug #4544 [security] XSS vulnerabilities in table search and table structure pages diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 73856198a9..67827f358b 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -1080,9 +1080,12 @@ class PMA_NavigationTree private function _fastFilterHtml($node) { $retval = ''; - $filter_min = (int)$GLOBALS['cfg']['NavigationTreeDisplayDbFilterMinimum']; + $filter_db_min + = (int) $GLOBALS['cfg']['NavigationTreeDisplayDbFilterMinimum']; + $filter_item_min + = (int) $GLOBALS['cfg']['NavigationTreeDisplayItemFilterMinimum']; if ($node === $this->_tree - && $this->_tree->getPresence() >= $filter_min + && $this->_tree->getPresence() >= $filter_db_min ) { $url_params = array( 'pos' => 0 @@ -1114,7 +1117,7 @@ class PMA_NavigationTree || $node->real_name == 'procedures' || $node->real_name == 'events')) && method_exists($node->realParent(), 'getPresence') - && $node->realParent()->getPresence($node->real_name) >= $filter_min + && $node->realParent()->getPresence($node->real_name) >= $filter_item_min ) { $paths = $node->getPaths(); $url_params = array(