diff options
author | Marc Delisle <marc@infomarc.info> | 2012-03-28 20:44:32 +0400 |
---|---|---|
committer | Marc Delisle <marc@infomarc.info> | 2012-03-28 20:44:32 +0400 |
commit | ed5fd8c852926addff157d3c7c5e95c0586db350 (patch) | |
tree | 601bcf436b04bfe9b7f9c275f53f6d6313cf3c5b | |
parent | 607cac114312e86ef618ca9529a1f20ca1dcf8a1 (diff) | |
parent | 957ef1cf7fc51577a0d993c76915bc30b0fa106d (diff) |
Merge branch 'QA_3_5'
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | show_config_errors.php | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -97,6 +97,9 @@ phpMyAdmin - ChangeLog - bug #3486970 [import] Exception on XML import - 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) - [security] XSS in replication setup, see PMASA-2012-1 diff --git a/show_config_errors.php b/show_config_errors.php index f130416265..7fed434b8e 100644 --- a/show_config_errors.php +++ b/show_config_errors.php @@ -16,6 +16,8 @@ error_reporting(E_ALL); /** * Read config file. */ -require CONFIG_FILE; +if (is_readable(CONFIG_FILE)) { + require CONFIG_FILE; +} ?> |