Merge commit '0d4d696'

This commit is contained in:
Marc Delisle 2014-05-16 12:20:25 -04:00
commit 152ed86bad

View File

@ -544,7 +544,7 @@ class PMA_NavigationTree
*/
public function groupNode($node)
{
if ($node->type != Node::CONTAINER) {
if ($node->type != Node::CONTAINER || $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']) {
return;
}