diff --git a/ChangeLog b/ChangeLog index f6b8c74a9c..d7bbb1a68f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,6 +73,7 @@ explanation + rfe #1441 Add regexp match when using AllowArbitraryServer 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 diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 91009c98e1..c27d21f312 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -741,6 +741,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 29fd5248de..2db8896ada 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -648,6 +648,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; + } } ?>