From 0cbd1b4c06fe3ff718371a347614733896ce9bfa Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 12 Mar 2012 06:22:45 +0000
Subject: [PATCH] Clarify this

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@324125 c90b9560-bf6c-de11-be94-00142212c4b1
---
 appendices/migration54.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/appendices/migration54.xml b/appendices/migration54.xml
index 39f12771d4..8c8b882ed3 100644
--- a/appendices/migration54.xml
+++ b/appendices/migration54.xml
@@ -1349,11 +1349,18 @@
   <itemizedlist>
    <listitem>
     <simpara>
-     The default character set is now <literal>UTF-8</literal>, instead of <literal>ISO-8859-1</literal>,
-     when the <link linkend="ini.default-charset">default_charset</link> configuration setting is not set
-     ("", which is the default). This applies to functions such as <function>htmlentities</function> and
-     <function>htmlspecialchars</function>, or any code that relies on <literal>determine_charset(NULL)</literal>
-     internally.
+     The default character set for <function>htmlspecialchars</function> 
+     and <function>htmlentities</function> is now <literal>UTF-8</literal>,
+     instead of <literal>ISO-8859-1</literal>.  Note that changing your output
+     charset via the <link linkend="ini.default-charset">default_charset</link>
+     configuration setting does not affect htmlspecialchars/htmlentities unless
+     you are passing "" (an empty string) as the encoding parameter to your 
+     <function>htmlspecialchars</function>/<function>htmlentities</function> calls.
+     Generally we do not recommend doing this because you should be able to
+     change your output charset without affecting the runtime charset used by
+     these functions. The safest approach is to explicitly set the charset on
+     each call to <function>htmlspecialchars</function> and 
+     <function>htmlentities</function>.
     </simpara>
    </listitem>
    <listitem>