Merge remote-tracking branch 'origin/master'

phpmyadmin · Sep 20, 2013 · 2867044 · 2867044
2 parents 4532db3 + 2b736c1
commit 2867044
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php
@@ -584,11 +584,11 @@ public function groupNode($node)
                     $groups[$key]->pos2 = $node->pos2;
                     $groups[$key]->pos3 = $node->pos3;
                     if ($node instanceof Node_Table_Container) {
+                        $tblGroup = '&amp;tbl_group='
+                            . urlencode($key . $node->separator);
                         $groups[$key]->links = array(
-                            'text' => $node->links['text']
-                                . '&amp;tbl_group=' . urlencode($key),
-                            'icon' => $node->links['icon']
-                                . '&amp;tbl_group=' . urlencode($key)
+                            'text' => $node->links['text'] . $tblGroup,
+                            'icon' => $node->links['icon'] . $tblGroup
                         );
                     }
                     $node->addChild($groups[$key]);