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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-10-10 08:14:05 +02:00
commit 17bb5aed89
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -62,6 +62,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

9
libraries/navigation/NavigationTree.class.php
View File

@ -1064,9 +1064,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
@ -1096,7 +1099,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(