Merge branch 'MAINT_4_5_5' into MAINT_4_5_5-security

phpmyadmin · Feb 29, 2016 · 3c583b8 · 3c583b8
2 parents 2925d64 + 88e0944
commit 3c583b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-11.
 - issue        [security] Multiple XSS vulnerabilities, see PMASA-2016-12.
 - issue        [security] Vulnerability allowing man-in-the-middle attack on API call to GitHub, see PMASA-2016-13.
+- issue #12048 Fixed inclusion of gettext library from SQL parser
 
 4.5.5.0 (2016-02-22)
 - issue        Undefined index: is_ajax_request

diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php
@@ -67,7 +67,8 @@ public static function getLoader(array $map)
 // This must be included before any class of the parser is loaded because
 // if there is no `__` function defined, the library defines a dummy one
 // in `common.php`.
-require_once './libraries/php-gettext/gettext.inc';
+require_once './libraries/vendor_config.php';
+require_once GETTEXT_INC;
 
 // Initializing the autoloader.
 return AutoloaderInit::getLoader(