gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode'

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-01-12 10:09:41 +05:30
parent 2248993e2f
commit b44e9cb312
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug Undefined index central_columnswork
- bug #4697 Server Status refresh not behaving as expected
- bug Null argument in array_multisort()
- bug #4699 Navigation panel should not hide icons based on 'TableNavigationLinksMode'
4.3.6.0 (2015-01-07)
- bug Undefined index notices while configuring recent and favorite tables

43
libraries/navigation/NavigationTree.class.php
View File

@ -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>";
}
} else {
$retval .= "<u>{$node->icon}</u>";
$retval .= "<div class='block'>";
if (isset($node->links['icon'])) {
$args = array();
foreach ($node->parents(true) as $parent) {
$args[] = urlencode($parent->real_name);
}
$retval .= "</div>";
$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>";
}
} else {
$retval .= "<u>{$node->icon}</u>";
}
$retval .= "</div>";
if (isset($node->links['text'])) {
$args = array();
foreach ($node->parents(true) as $parent) {