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

bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-10-05 00:34:56 +05:30
parent e234958545
commit f7a31e5f4c
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog
====================== ======================
3.4.7.0 (not yet released) 3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false
3.4.6.0 (not yet released) 3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases - patch #3404173 InnoDB comment display with tooltips/aliases

16
libraries/navigation_header.inc.php
View File

@@ -97,15 +97,27 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
if ($GLOBALS['cfg']['MainPageIconic']) { if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"' echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
.' alt="' . __('phpMyAdmin documentation') . '" />'; .' alt="' . __('phpMyAdmin documentation') . '" />';
} else {
echo '<br />' . __('phpMyAdmin documentation');
} }
echo '</a>'; echo '</a>';
echo ' ' . PMA_showMySQLDocu('', '', TRUE) . "\n";
$documentation_link = PMA_showMySQLDocu('', '', true);
if ($GLOBALS['cfg']['MainPageIconic']) {
echo $documentation_link . "\n";
} else {
preg_match('/<a[^>]*>/', $documentation_link, $matches);
$link = $matches[0];
echo substr($link, 0, strlen($link) - 1) . ' title="' . __('Documentation') . '" >'
. '<br />' . __('Documentation') . '</a>';
}
$params = array('uniqid' => uniqid()); $params = array('uniqid' => uniqid());
if (!empty($GLOBALS['db'])) { if (!empty($GLOBALS['db'])) {
$params['db'] = $GLOBALS['db']; $params['db'] = $GLOBALS['db'];
} }
echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">'; echo '<a href="navigation.php?' . PMA_generate_common_url($params)
. '" title="' . __('Reload navigation frame') . '" target="frame_navigation">';
if ($GLOBALS['cfg']['MainPageIconic']) { if ($GLOBALS['cfg']['MainPageIconic']) {
echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"' echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
. ' title="' . __('Reload navigation frame') . '"' . ' title="' . __('Reload navigation frame') . '"'