Merge branch 'MAINT_4_5_3' into QA_4_5

2015-12-25 14:48:04 -05:00 · 2015-12-25 14:48:04 -05:00 · 73544de531
commit 73544de531
parent 9de6ee383c c4d649325b
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog

 4.5.3.1 (2015-12-25)
 - issue #11774 Undefined offset 2
+- issue        [Security] Path disclosure, see PMASA-2015-6

 4.5.3.0 (2015-12-23)
 - issue #11744 Incomplete results of UNION ALL
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@ -11,7 +11,7 @@
 */

 if (!function_exists('__')) {
-    PMA_fatalError('Bad invocation!');
+    exit();
 }

 $strConfigAllowArbitraryServer_desc = __(