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

Merge remote-tracking branch 'origin/QA_3_4' into QA_3_4

Browse Source
This commit is contained in:
Michal Čihař
2012-03-28 18:46:02 +02:00
parent 3b2dfbfcb1 a183e6310e
commit 2d39f4994a
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
- bug #3486970 [import] Exception on XML import - bug #3486970 [import] Exception on XML import
- bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation
3.4.10.2 (2012-03-28)
- [security] Fixed local path disclosure vulnerability, see PMASA-2012-2
3.4.10.1 (2012-02-18) 3.4.10.1 (2012-02-18)
- [security] XSS in replication setup, see PMASA-2012-1 - [security] XSS in replication setup, see PMASA-2012-1

4
show_config_errors.php
View File

@@ -14,6 +14,8 @@ error_reporting(E_ALL);
/** /**
* Read config file. * Read config file.
*/ */
require CONFIG_FILE; if (is_readable(CONFIG_FILE)) {
require CONFIG_FILE;
}
?> ?>