Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-09-10 06:40:17 +02:00
commit 1be9b070b2
2 changed files with 4 additions and 3 deletions

View File

@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
- bug #3404886 [navi] Edit SQL statement after error
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd

View File

@ -578,12 +578,12 @@ $is_modify_link = true, $back_url = '', $exit = true)
if (strlen($table)) {
$_url_params['db'] = $db;
$_url_params['table'] = $table;
$doedit_goto = '<a href="tbl_sql.php?' . PMA_generate_common_url($_url_params) . '">';
$doedit_goto = '<a href="tbl_sql.php' . PMA_generate_common_url($_url_params) . '">';
} elseif (strlen($db)) {
$_url_params['db'] = $db;
$doedit_goto = '<a href="db_sql.php?' . PMA_generate_common_url($_url_params) . '">';
$doedit_goto = '<a href="db_sql.php' . PMA_generate_common_url($_url_params) . '">';
} else {
$doedit_goto = '<a href="server_sql.php?' . PMA_generate_common_url($_url_params) . '">';
$doedit_goto = '<a href="server_sql.php' . PMA_generate_common_url($_url_params) . '">';
}
$error_msg_output .= $doedit_goto