#4716 Collapse all in navigation panel is sometimes broken

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-01-21 08:38:43 +05:30
parent 4e5866a8a6
commit 97dc4831a4
2 changed files with 2 additions and 3 deletions

View File

@ -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']
);

View File

@ -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 {