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:
Marc Delisle
2011-10-04 06:20:28 -04:00
parent 7d586b458d 1af420e223
commit bc5aa87ae9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -23,6 +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)
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
libraries/config/ConfigFile.class.php
View File

@@ -422,7 +422,7 @@ class ConfigFile
} }
$verbose = $this->get("Servers/$id/verbose"); $verbose = $this->get("Servers/$id/verbose");
if (!empty($verbose)) { if (!empty($verbose)) {
return $verbose; return htmlspecialchars($verbose);
} }
$host = $this->get("Servers/$id/host"); $host = $this->get("Servers/$id/host");
return empty($host) ? 'localhost' : $host; return empty($host) ? 'localhost' : $host;