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

Merge branch 'MAINT_3_4_6' into QA_3_4

Browse Source
This commit is contained in:
Dieter Adriaenssens
2011-10-04 19:15:42 +02:00
parent bc5aa87ae9 ca597dc423
commit e234958545
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -23,7 +23,7 @@ phpMyAdmin - ChangeLog
- patch #3314626 [display] CharTextareaRows is not respected - patch #3314626 [display] CharTextareaRows is not respected
- bug #3417089 [synchronize] Extraneous db choices - bug #3417089 [synchronize] Extraneous db choices
- [security] Fixed local path disclosure vulnerability, see PMASA-2011-15 - [security] Fixed local path disclosure vulnerability, see PMASA-2011-15
- [security] Fixed XSS in setup (verbose parameter) - [security] Fixed XSS in setup (host/verbose parameter), see PMASA-2011-16
3.4.5.0 (2011-09-14) 3.4.5.0 (2011-09-14)
- bug #3375325 [interface] Page list in navigation frame looks odd - bug #3375325 [interface] Page list in navigation frame looks odd

2
setup/frames/servers.inc.php
View File

@@ -26,7 +26,7 @@ $server_exists = !empty($id) && $cf->get("Servers/$id") !== null;
if ($mode == 'edit' && $server_exists) { if ($mode == 'edit' && $server_exists) {
$page_title = __('Edit server') $page_title = __('Edit server')
. ' ' . $id . ' <small>(' . $cf->getServerDSN($id) . ')</small>'; . ' ' . $id . ' <small>(' . htmlspecialchars($cf->getServerDSN($id)) . ')</small>';
} elseif ($mode == 'remove' && $server_exists) { } elseif ($mode == 'remove' && $server_exists) {
$cf->removeServer($id); $cf->removeServer($id);
header('Location: index.php'); header('Location: index.php');