From 1f12169eebfa005ead36d07d50befb3cbabbaa18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 13 Nov 2017 12:37:24 +0100
Subject: [PATCH] Add SJIS-win to default list of allowed charsets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #13803

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                    | 1 +
 libraries/config.default.php | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7ae4ab3c9e..85db37fae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 4aca4a657e..b0d3701ffa 100644
--- 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',
 );