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

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-01-22 16:35:41 +05:30
commit c84304aae9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/navigation.js
View File

@ -1125,10 +1125,10 @@ var PMA_fastFilter = {
var $filterContainer = $this.closest('div.list_container');
var $filterInput = $([]);
if ($filterContainer
.children('li.fast_filter:not(.db_fast_filter) input.searchClause')
.find('li.fast_filter:not(.db_fast_filter) input.searchClause')
.length !== 0) {
$filterInput = $filterContainer
.children('li.fast_filter:not(.db_fast_filter) input.searchClause');
.find('li.fast_filter:not(.db_fast_filter) input.searchClause');
}
var searchClause2 = '';
if ($filterInput.length !== 0 &&

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

@ -1292,8 +1292,7 @@ class PMA_NavigationTree
'vPath' => $paths['vPath'],
'pos' => $this->_pos,
'server' => $GLOBALS['server'],
'pos2_name' => $paths['aPath_clean'][2],
'searchClause2' => $this->_searchClause2
'pos2_name' => $paths['aPath_clean'][2]
);
if ($level == 3) {
$pos = $node->pos3;