From 97dc4831a42234e82cdda7973088a9c82731396d Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 21 Jan 2015 08:38:43 +0530
Subject: [PATCH] #4716 Collapse all in navigation panel is sometimes broken

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

diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
index 2dd06e6114..fc6acd0e07 100644
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@@ -970,8 +970,7 @@ class PMA_NavigationTree
                     $retval .= "<b></b>";
                 }
 
-                $match = $this->_findTreeMatch($this->_aPath, $paths['aPath_clean']);
-                $match |= $this->_findTreeMatch(
+                $match = $this->_findTreeMatch(
                     $this->_vPath,
                     $paths['vPath_clean']
                 );
diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php
index a9bb228edd..ddbd15e94e 100644
--- a/libraries/navigation/Nodes/Node.class.php
+++ b/libraries/navigation/Nodes/Node.class.php
@@ -713,7 +713,7 @@ class Node
     {
         if ($GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
             return '';
-        } elseif ($match && ! $this->is_group) {
+        } elseif ($match) {
             $this->visible = true;
             return PMA_Util::getImage('b_minus.png');
         } else {