Add SJIS-win to default list of allowed charsets

Fixes #13803 Signed-off-by: Michal Čihař <michal@cihar.com>
2017-11-13 12:37:24 +01:00 · 2017-11-13 12:37:24 +01:00 · 1f12169eeb
commit 1f12169eeb
parent 7406c2cb41
2 changed files with 4 additions and 1 deletions
--- a/1
+++ b/1
@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog

 4.7.6 (not yet released)
 - issue #13517 Fixed check all interaction with filtering
+- issue #13803 Add SJIS-win to default list of allowed charsets

 4.7.5 (2017-10-23)
 - issue #13615 Avoid problems with browsing unknown query types
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@ -2575,7 +2575,9 @@ $cfg['AvailableCharsets'] = array(
    'euc-jp',
    'ks_c_5601-1987',
    'tis-620',
-    'SHIFT_JIS'
+    'SHIFT_JIS',
+    'SJIS',
+    'SJIS-win',
 );