Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

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

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