Honor vendor configuration for gettext inclusion

Fixes #12048 Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Feb 29, 2016 · 88e0944 · 88e0944
1 parent 1297747
commit 88e0944
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty.
 - issue #12020 New statement but no delimiter and unexpected token with REPLACE.
 - issue #12029 Fixed incorrect usage of SQL parser context in SQL export
+- 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(