webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Marc Delisle
2014-05-16 09:56:52 -04:00
parent 0ee881da71 0dbbab8fdc
commit e2817dfdfd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/navigation/NavigationTree.class.php
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;
}