From 3ecafc5973a62a4a5aba6fd51034f464869443e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 12 Jan 2016 11:26:44 +0100 Subject: [PATCH] Move mysql_charset_map to common.inc.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be later removed (as it's IMHO not needed), but we move it out of select_lang.inc.php where it really doesn't belong. Signed-off-by: Michal Čihař --- libraries/common.inc.php | 29 +++++++++++++++++++++++++++++ libraries/select_lang.inc.php | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index fa4785387a..54eedbe0cf 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1089,3 +1089,32 @@ if (! defined('PMA_MINIMUM_COMMON')) { include 'libraries/config/user_preferences.forms.php'; include_once 'libraries/config/page_settings.forms.php'; } + +/** + * @global array MySQL charsets map + */ +$GLOBALS['mysql_charset_map'] = array( + 'big5' => 'big5', + 'cp-866' => 'cp866', + 'euc-jp' => 'ujis', + 'euc-kr' => 'euckr', + 'gb2312' => 'gb2312', + 'gbk' => 'gbk', + 'iso-8859-1' => 'latin1', + 'iso-8859-2' => 'latin2', + 'iso-8859-7' => 'greek', + 'iso-8859-8' => 'hebrew', + 'iso-8859-8-i' => 'hebrew', + 'iso-8859-9' => 'latin5', + 'iso-8859-13' => 'latin7', + 'iso-8859-15' => 'latin1', + 'koi8-r' => 'koi8r', + 'shift_jis' => 'sjis', + 'tis-620' => 'tis620', + 'utf-8' => 'utf8', + 'windows-1250' => 'cp1250', + 'windows-1251' => 'cp1251', + 'windows-1252' => 'latin1', + 'windows-1256' => 'cp1256', + 'windows-1257' => 'cp1257', +); diff --git a/libraries/select_lang.inc.php b/libraries/select_lang.inc.php index 484c3a4182..faef272496 100644 --- a/libraries/select_lang.inc.php +++ b/libraries/select_lang.inc.php @@ -59,35 +59,6 @@ if (! empty($GLOBALS['cfg']['FilterLanguages'])) { unset($key, $val, $new_lang); } -/** - * @global array MySQL charsets map - */ -$GLOBALS['mysql_charset_map'] = array( - 'big5' => 'big5', - 'cp-866' => 'cp866', - 'euc-jp' => 'ujis', - 'euc-kr' => 'euckr', - 'gb2312' => 'gb2312', - 'gbk' => 'gbk', - 'iso-8859-1' => 'latin1', - 'iso-8859-2' => 'latin2', - 'iso-8859-7' => 'greek', - 'iso-8859-8' => 'hebrew', - 'iso-8859-8-i' => 'hebrew', - 'iso-8859-9' => 'latin5', - 'iso-8859-13' => 'latin7', - 'iso-8859-15' => 'latin1', - 'koi8-r' => 'koi8r', - 'shift_jis' => 'sjis', - 'tis-620' => 'tis620', - 'utf-8' => 'utf8', - 'windows-1250' => 'cp1250', - 'windows-1251' => 'cp1251', - 'windows-1252' => 'latin1', - 'windows-1256' => 'cp1256', - 'windows-1257' => 'cp1257', -); - /* * Do the work! */