Load gettext before autoloader

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ř <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-04-05 09:24:15 +02:00
parent 33e32daf17
commit a65a4213d7
2 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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
*/