betz            Mon Mar  3 13:03:14 2003 EDT

  Modified files:              
    /phpdoc/en/reference/strings/functions      htmlentities.xml 
                                                html-entity-decode.xml 
                                                htmlspecialchars.xml 
  Log:
  fix for bug #21592, list of supported charsets added
  
  
Index: phpdoc/en/reference/strings/functions/htmlentities.xml
diff -u phpdoc/en/reference/strings/functions/htmlentities.xml:1.8 
phpdoc/en/reference/strings/functions/htmlentities.xml:1.9
--- phpdoc/en/reference/strings/functions/htmlentities.xml:1.8  Mon Nov 18 12:26:12 
2002
+++ phpdoc/en/reference/strings/functions/htmlentities.xml      Mon Mar  3 13:03:12 
2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.htmlentities">
    <refnamediv>
@@ -54,15 +54,16 @@
      </table>
     </para>
     <para>
-     Support for the optional <parameter>quote</parameter> parameter was 
+     Support for the optional <parameter>quote</parameter> parameter was
      added in PHP 4.0.3.
     </para>
     <para>
      Like <function>htmlspecialchars</function>, it takes an optional
-     third argument which defines character set used in conversion.
-     Support for this argument was added in PHP 4.1.0.  Presently, the 
-     ISO-8859-1 character set is used as the default.
+     third argument <parameter>charset</parameter> which defines character
+     set used in conversion. Support for this argument was added in PHP 4.1.0.
+     Presently, the ISO-8859-1 character set is used as the default.
     </para>
+    &reference.strings.charsets;
     <para>
      If you're wanting to decode instead (the reverse) you can use
      <function>html_entity_decode</function>.
Index: phpdoc/en/reference/strings/functions/html-entity-decode.xml
diff -u phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.3 
phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.4
--- phpdoc/en/reference/strings/functions/html-entity-decode.xml:1.3    Sat Dec 28 
10:52:27 2002
+++ phpdoc/en/reference/strings/functions/html-entity-decode.xml        Mon Mar  3 
13:03:13 2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.html-entity-decode">
    <refnamediv>
@@ -54,9 +54,10 @@
     </para>
     <para>
      The ISO-8859-1 character set is used as default for the optional third
-     <parameter>charset</parameter>.  This defines the character set used in
-     conversion.
+     <parameter>charset</parameter>. This defines the character set used in
+     conversion. Support for this third argument was added in PHP 4.1.0.
     </para>
+    &reference.strings.charsets;    
     <para>
      <example>
       <title>Decoding html entities</title>
Index: phpdoc/en/reference/strings/functions/htmlspecialchars.xml
diff -u phpdoc/en/reference/strings/functions/htmlspecialchars.xml:1.5 
phpdoc/en/reference/strings/functions/htmlspecialchars.xml:1.6
--- phpdoc/en/reference/strings/functions/htmlspecialchars.xml:1.5      Sat Mar  1 
04:42:32 2003
+++ phpdoc/en/reference/strings/functions/htmlspecialchars.xml  Mon Mar  3 13:03:13 
2003
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
 <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
   <refentry id="function.htmlspecialchars">
    <refnamediv>
@@ -71,7 +71,10 @@
       <title><function>htmlspecialchars</function> example</title>
       <programlisting role="php">
 <![CDATA[
+<?php
 $new = htmlspecialchars("<a href='test'>Test</a>", ENT_QUOTES);
+echo $new; // &lt;a href=&#039;test&#039;&gt;Test&lt;/a&gt;
+?>
 ]]>
       </programlisting>
      </example>
@@ -83,10 +86,11 @@
      second argument was added in PHP 3.0.17 and PHP 4.0.3.
     </para>
     <para>
-     The third argument defines character set used in conversion. The
-     default character set is ISO-8859-1. Support for this third argument was
-     added in PHP 4.1.0.
+     The third argument <parameter>charset</parameter> defines character set
+     used in conversion. The default character set is ISO-8859-1. Support for
+     this third argument was added in PHP 4.1.0.
     </para>
+    &reference.strings.charsets;
     <para>
      See also <function>get_html_translation_table</function>,
      <function>htmlentities</function>, and <function>nl2br</function>.



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to