Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--po/ja.po2
-rw-r--r--show_config_errors.php4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee58277787..066795ff7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -80,6 +80,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/po/ja.po b/po/ja.po
index c48602f23f..a47e105b35 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,7 +12,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 0.7\n"
+"X-Generator: Weblate 0.8\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:350
#: libraries/display_tbl.lib.php:359 server_privileges.php:1677
diff --git a/show_config_errors.php b/show_config_errors.php
index d3f9dbee71..d541c3ce2c 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;
+}
?>