Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2

2014-05-16 09:56:52 -04:00 · 2014-05-16 09:56:52 -04:00 · e2817dfdfd
commit e2817dfdfd
parent 0ee881da71 0dbbab8fdc
1 changed files with 1 additions and 1 deletions
--- a/libraries/navigation/NavigationTree.class.php
+++ b/libraries/navigation/NavigationTree.class.php
@ -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;
        }