Added mbstring.encoding_translation to php.ini-dist|recommended

diff --git a/php.ini-dist b/php.ini-dist
index 65af29e25ff4024c755d1f212ab12ea6932a690c..5a8c57c76d97517dd4a0b765fb242e9f1c5de707 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -953,6 +953,13 @@ sockets.use_system_read = On
 ; registered as output buffer to function
 ;mbstring.http_output = SJIS
 
+; enable automatic encoding translation accoding to 
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
+;       portable libs/applications.
+;mbstring.encoding_translation = Off
+
 ; automatic encoding detection order.
 ; auto means 
 ;mbstring.detect_order = auto

diff --git a/php.ini-recommended b/php.ini-recommended
index ae99b22606668b6e1bf788c31d2447ae2cea1afd..c4d2a8d14fe475d88e625a82a6ac3d6b254209c4 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -966,6 +966,13 @@ sockets.use_system_read = On
 ; registered as output buffer to function
 ;mbstring.http_output = SJIS
 
+; enable automatic encoding translation accoding to 
+; mbstring.internal_encoding setting. Input chars are
+; converted to internal encoding by setting this to On.
+; Note: Do _not_ use automatic encoding translation for
+;       portable libs/applications.
+;mbstring.encoding_translation = Off
+
 ; automatic encoding detection order.
 ; auto means 
 ;mbstring.detect_order = auto