svn: /phpdoc/en/trunk/reference/strings/functions/ htmlentities.xml htmlspecialchars.xml

From: Date: Fri, 27 Jan 2012 21:12:54 +0000
Subject: svn: /phpdoc/en/trunk/reference/strings/functions/ htmlentities.xml htmlspecialchars.xml
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-9505@lists.php.net to get a copy of this message
nikic Fri, 27 Jan 2012 21:12:54 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=322870 Log: Revert accidental revert of some changes. Sorry for that. Changed paths: U phpdoc/en/trunk/reference/strings/functions/htmlentities.xml U phpdoc/en/trunk/reference/strings/functions/htmlspecialchars.xml Modified: phpdoc/en/trunk/reference/strings/functions/htmlentities.xml =================================================================== --- phpdoc/en/trunk/reference/strings/functions/htmlentities.xml 2012-01-27 21:11:49 UTC (rev 322869) +++ phpdoc/en/trunk/reference/strings/functions/htmlentities.xml 2012-01-27 21:12:54 UTC (rev 322870) @@ -123,12 +123,14 @@ <term><parameter>charset</parameter></term> <listitem> <para> - Like <function>htmlspecialchars</function>, it takes an optional - third argument <parameter>charset</parameter> which defines character - set used in conversion. - Presently, the ISO-8859-1 character set is used as the default. - However, this default is very likely to change in future versions of - PHP; the programmer is highly encouraged to specify a value. + Like <function>htmlspecialchars</function>, + <function>htmlentities</function> takes an optional third argument + <parameter>charset</parameter> which defines character set used in + conversion. + If omitted, the default value for this argument is ISO-8859-1 in + versions of PHP prior to 5.4.0, and UTF-8 from PHP 5.4.0 onwards. + Although this argument is technically optional, you are highly + encouraged to specify the correct value for your code. </para> &reference.strings.charsets; </listitem> @@ -171,6 +173,13 @@ </row> </thead> <tbody> + <row> + <entry>5.4.0</entry> + <entry> + The default value for the <parameter>charset</parameter> parameter was + changed to UTF-8. + </entry> + </row> <row> <entry>5.4.0</entry> <entry> Modified: phpdoc/en/trunk/reference/strings/functions/htmlspecialchars.xml =================================================================== --- phpdoc/en/trunk/reference/strings/functions/htmlspecialchars.xml 2012-01-27 21:11:49 UTC (rev 322869) +++ phpdoc/en/trunk/reference/strings/functions/htmlspecialchars.xml 2012-01-27 21:12:54 UTC (rev 322870) @@ -161,7 +161,8 @@ <listitem> <para> Defines character set used in conversion. - The default character set is ISO-8859-1. + If omitted, the default value for this argument is ISO-8859-1 in + versions of PHP prior to 5.4.0, and UTF-8 from PHP 5.4.0 onwards. </para> <para> For the purposes of this function, the charsets @@ -214,6 +215,13 @@ </row> </thead> <tbody> + <row> + <entry>5.4.0</entry> + <entry> + The default value for the <parameter>charset</parameter> parameter was + changed to UTF-8. + </entry> + </row> <row> <entry>5.4.0</entry> <entry>

« previous php.doc.cvs (#9505) next »