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

Merge branch 'QA_3_4'

Browse Source 
Conflicts:
	libraries/navigation_header.inc.php
This commit is contained in:
Madhura Jayaratne 2011-10-05 00:42:56 +05:30
commit 0cacdc7fca
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

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

16
libraries/navigation_header.inc.php
View File

@ -92,15 +92,27 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
if ($GLOBALS['cfg']['MainPageIconic']) {
echo PMA_getImage('b_docs.png', __('phpMyAdmin documentation'));
} else {
echo '<br />' . __('phpMyAdmin documentation');
}
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());
if (!empty($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']) {
echo PMA_getImage('s_reload', __('Reload navigation frame'));
} else {