diff options
Diffstat (limited to 'libraries/navigation/NavigationTree.class.php')
| -rw-r--r-- | libraries/navigation/NavigationTree.class.php | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 1b9ae22c61..2dd06e6114 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -693,12 +693,9 @@ class PMA_NavigationTree ); $groups[$key]->separator = $node->separator; $groups[$key]->separator_depth = $node->separator_depth - 1; - $groups[$key]->icon = ''; - if (PMA_Util::showIcons('TableNavigationLinksMode')) { - $groups[$key]->icon = PMA_Util::getImage( - 'b_group.png' - ); - } + $groups[$key]->icon = PMA_Util::getImage( + 'b_group.png' + ); $groups[$key]->pos2 = $node->pos2; $groups[$key]->pos3 = $node->pos3; if ($node instanceof Node_Table_Container @@ -1025,25 +1022,25 @@ class PMA_NavigationTree if ($node->type == Node::CONTAINER) { $retval .= "<i>"; } - if (PMA_Util::showIcons('TableNavigationLinksMode')) { - $retval .= "<div class='block'>"; - if (isset($node->links['icon'])) { - $args = array(); - foreach ($node->parents(true) as $parent) { - $args[] = urlencode($parent->real_name); - } - $link = vsprintf($node->links['icon'], $args); - if ($linkClass != '') { - $retval .= "<a class='$linkClass' href='$link'>"; - $retval .= "{$node->icon}</a>"; - } else { - $retval .= "<a href='$link'>{$node->icon}</a>"; - } + + $retval .= "<div class='block'>"; + if (isset($node->links['icon'])) { + $args = array(); + foreach ($node->parents(true) as $parent) { + $args[] = urlencode($parent->real_name); + } + $link = vsprintf($node->links['icon'], $args); + if ($linkClass != '') { + $retval .= "<a class='$linkClass' href='$link'>"; + $retval .= "{$node->icon}</a>"; } else { - $retval .= "<u>{$node->icon}</u>"; + $retval .= "<a href='$link'>{$node->icon}</a>"; } - $retval .= "</div>"; + } else { + $retval .= "<u>{$node->icon}</u>"; } + $retval .= "</div>"; + if (isset($node->links['text'])) { $args = array(); foreach ($node->parents(true) as $parent) { |