Fix: make debugger work correctly when any field value is LATIN-1

[plcapi.git] / debugger / common.php

diff --git a/debugger/common.php b/debugger/common.php
index adaf366..89a995b 100644 (file)
--- a/debugger/common.php
+++ b/debugger/common.php
@@ -22,10 +22,13 @@
     $_GET = array_map('stripslashes_deep', $_GET);
   }
 
+  $preferredEncodings = 'UTF-8, ASCII, ISO-8859-1, UTF-7, EUC-JP, SJIS, eucJP-win, SJIS-win, JIS, ISO-2022-JP';
+  $inputcharset = mb_detect_encoding(urldecode($_SERVER['REQUEST_URI']), $preferredEncodings);
 
   if ( isset( $_GET['usepost'] ) && $_GET['usepost'] === 'true' )
   {
       $_GET = $_POST;
+      $inputcharset = mb_detect_encoding(implode('', $_GET), $preferredEncodings);
   }
 
 // recover input parameters