From 18bccea2915d770a67812e0be9e5fded9166b159 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 16 Mar 2015 04:31:21 +0530 Subject: [PATCH 1/2] Fixes bug #4803 Signed-off-by: Deven Bansod --- libraries/navigation/NavigationTree.class.php | 7 +++++++ libraries/navigation/Nodes/Node_Database.class.php | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index fc6acd0e07..d6f47f68ab 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -733,6 +733,13 @@ class PMA_NavigationTree $keySeparatorLength ) ); + + if ($new_child instanceof Node_Database + && $child->getHiddenCount() > 0 + ) { + $new_child->setHiddenCount($child->getHiddenCount()); + } + $new_child->real_name = $child->real_name; $new_child->icon = $child->icon; $new_child->links = $child->links; diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 7fca56c110..e8151d93da 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -652,6 +652,16 @@ class Node_Database extends Node { $this->_hiddenCount = $count; } + + /** + * Returns the number of hidden items in this database + * + * @return int hidden item count + */ + public function getHiddenCount() + { + return $this->_hiddenCount; + } } ?> From 12e8654df065a7d395f5c159c27485320fe9004e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 16 Mar 2015 07:59:26 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c0e198e255..98d2072d80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.13.0 (not yet released) +- bug #4803 "Show hidden items" is sometimes hidden 4.3.12.0 (2015-03-14) - bug #4746 Right-aligned columns have left-aligned header