From a65a4213d7ab94172d0b2d23d0b1c43295ad1d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 5 Apr 2016 09:24:15 +0200 Subject: [PATCH] Load gettext before autoloader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes possible PHP error in SQL parser as it tries to define __() if it's not existing. Later loading of gettext just breaks this. Fixes #12154 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/common.inc.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b24157720a..f22c9260ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #12135 Fix offering JSON datatype in incompatible MySQL versions - issue #12132 Can not open table with JSON field - issue #12125 Cannot highlight a column if I scroll down from the top of the table +- issue #12154 Fixed possible PHP error in SQL parser 4.6.0.0 (2016-03-22) + issue #11456 Disabled storage engines diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 57be432b4d..09c7de5060 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -71,6 +71,11 @@ define('PHPMYADMIN', true); */ require_once './libraries/vendor_config.php'; +/** + * Load gettext functions. + */ +require_once GETTEXT_INC; + /** * Activate autoloader */ @@ -471,11 +476,6 @@ if (PMA_isValid($_REQUEST['sql_query'])) { /******************************************************************************/ /* loading language file LABEL_loading_language_file */ -/** - * Load gettext functions. - */ -require_once GETTEXT_INC; - /** * lang detection is done here */