bug #2355925 [display] properly update tooltips in navigation frame

1 files changed, 3 insertions, 34 deletions

diff --git a/navigation.php b/navigation.php
index 1dca523928..de6ada7f76 100644
--- a/navigation.php
+++ b/navigation.php
@@ -606,10 +606,11 @@ function PMA_displayTableList($tables, $visible = false,
             }
             echo '</li>' . "\n";
         } elseif (is_array($table)) {
+            $link_title = PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']);
             // quick access icon next to each table name
             echo '<li>' . "\n";
             echo '<a title="'
-                . htmlspecialchars(PMA_getTitleForTarget($GLOBALS['cfg']['LeftDefaultTabTable']))
+                . htmlspecialchars($link_title)
                 . ': ' . htmlspecialchars($table['Comment'])
                 .' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . $GLOBALS['strRows'] . ')"'
                 .' id="quick_' . htmlspecialchars($table_db . '.' . $table['Name']) . '"'
@@ -625,7 +626,7 @@ function PMA_displayTableList($tables, $visible = false,
                 echo ' src="' . $GLOBALS['pmaThemeImage'] . 'b_sbrowse.png"';
             }
             echo ' id="icon_' . htmlspecialchars($table_db . '.' . $table['Name']) . '"'
-                .' width="10" height="10" alt="' . $GLOBALS['strBrowse'] . '" /></a>' . "\n";
+                .' width="10" height="10" alt="' . htmlspecialchars($link_title) . '" /></a>' . "\n";
 
             // link for the table name itself
             $href = $GLOBALS['cfg']['DefaultTabTable'] . '?'
@@ -643,38 +644,6 @@ function PMA_displayTableList($tables, $visible = false,
     echo '</ul>';
 }
 
-/**
- * get the action word corresponding to a script name
- * in order to display it as a title in navigation panel
- *
- * @uses    switch()
- * @uses    $GLOBALS
- * @param   string  a valid value for $cfg['LeftDefaultTabTable']
- *                  or $cfg['DefaultTabTable']
- */
-function PMA_getTitleForTarget($target) {
-    switch ($target) {
-        case 'tbl_structure.php':
-            $message = 'strStructure';
-            break;
-        case 'tbl_sql.php':
-            $message = 'strSQL';
-            break;
-        case 'tbl_select.php':
-            $message = 'strSearch';
-            break;
-        case 'tbl_change.php':
-            $message = 'strInsert';
-            break;
-        case 'sql.php':
-            $message = 'strBrowse';
-            break;
-        default:
-            $message = '';
-    }
-    return $GLOBALS[$message];
-}
-
 echo '</div>' . "\n";
 
 PMA_exitNavigationFrame();