From 4f493b110efe479473f049def6ee367d8de2d167 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 22 Jan 2015 16:34:46 +0530
Subject: [PATCH] A better way to handle navigation in filtered results

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/navigation.js                              | 4 ++--
 libraries/navigation/NavigationTree.class.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/navigation.js b/js/navigation.js
index 80fcb88400..c3d7435569 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1136,10 +1136,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 &&
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index cea0f91801..fc6acd0e07 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -1278,8 +1278,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;