From 3c89e2ca6bcd91e8173cd41aaebf559296f1cd0c Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 9 Oct 2013 18:58:40 +0530
Subject: [PATCH] bug #3911 Filtering database names includes empty groupings

---
 ChangeLog        |  1 +
 js/navigation.js | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 91218b14cb..c2ab159c03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 - bug #4104 Can't edit updatable view when searching
 - bug #4108 Missing refresh by deleting databases
 - bug #3995 Drizzle server charset notice
+- bug #3911 Filtering database names includes empty groupings
 
 4.0.8.0 (2013-10-06)
 - bug #3988 Rename view is not working
diff --git a/js/navigation.js b/js/navigation.js
index 4806f43730..87df672300 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -928,18 +928,23 @@ var PMA_fastFilter = {
                 }
             });
             var container_filter = function ($curr, str) {
-                $curr.children('li').children('a.container').each(function () {
-                    var $group = $(this).parent().children('ul');
-                    if ($group.children('li').children('a.container').length > 0) {
-                        container_filter($group); // recursive
-                    }
-                    $group.parent().show().removeClass('hidden');
-                    if ($group.children().not('.hidden').length == 0) {
-                        $group.parent().hide().addClass('hidden');
+                $curr.children('ul').children('li.navGroup').each(function() {
+                    var $group = $(this);
+                    $group.children('div.list_container').each(function() {
+                        container_filter($(this)); // recursive
+                    });
+                    $group.show().removeClass('hidden');
+                    if ($group.children('div.list_container').children('ul')
+                            .children('li').not('.hidden').length === 0) {
+                        $group.hide().addClass('hidden');
                     }
                 });
             };
-            container_filter($obj, str);
+            if ($(this).closest('li.fast_filter').is('.db_fast_filter')) {
+                container_filter($('#pma_navigation_tree_content'), str);
+            } else {
+                container_filter($obj, str);
+            }
             if ($(this).val() != this.defaultValue && $(this).val() != '') {
                 if (! $obj.data('fastFilter')) {
                     $obj.data(