Merge branch 'QA_4_5' into QA_4_6

phpmyadmin · Feb 11, 2016 · 1960ab7 · 1960ab7
2 parents c0f58c0 + 3d196ef
commit 1960ab7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -60,6 +60,7 @@ phpMyAdmin - ChangeLog
 - issue #11800 Syntax Verifier error using REGEXP in SQL statement
 - issue #11799 Backslashes in comments are being interpreted as escape characters
 - issue #11909 Can't insert row into table that contains generated column
+- issue #11677 sql-parser and php-gettext collide.
 
 4.5.4.1 (2016-01-29)
 - issue #11892 Error with PMA 4.4.15.3

diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php
@@ -63,6 +63,12 @@ public static function getLoader(array $map)
     }
 }
 
+// php-gettext is used to translate error messages.
+// 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';
+
 // Initializing the autoloader.
 return AutoloaderInit::getLoader(
     array(