curt Mon Sep 6 16:13:43 2004 EDT
Modified files:
/phpdoc/en/reference/array/functions count.xml
/phpdoc/en/reference/var/functions get-defined-vars.xml
Log:
fix #29885, count() doesn't handle infinite recursion.
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/count.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/reference/array/functions/count.xml
diff -u phpdoc/en/reference/array/functions/count.xml:1.11
phpdoc/en/reference/array/functions/count.xml:1.12
--- phpdoc/en/reference/array/functions/count.xml:1.11 Mon Dec 15 13:41:56 2003
+++ phpdoc/en/reference/array/functions/count.xml Mon Sep 6 16:13:39 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.count">
<refnamediv>
@@ -35,6 +35,7 @@
will recursively count the array. This is particularly useful for
counting all the elements of a multidimensional array. The default
value for <parameter>mode</parameter> is <literal>0</literal>.
+ <function>count</function> does not detect infinite recursion.
</para>
<caution>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/var/functions/get-defined-vars.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/var/functions/get-defined-vars.xml
diff -u phpdoc/en/reference/var/functions/get-defined-vars.xml:1.8
phpdoc/en/reference/var/functions/get-defined-vars.xml:1.9
--- phpdoc/en/reference/var/functions/get-defined-vars.xml:1.8 Thu Aug 12 11:29:06
2004
+++ phpdoc/en/reference/var/functions/get-defined-vars.xml Mon Sep 6 16:13:42
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.34 -->
<refentry id="function.get-defined-vars">
<refnamediv>
@@ -17,7 +17,9 @@
<para>
This function returns an multidimensional array containing a list of
all defined variables, be them environment, server or user-defined
- variables.
+ variables, within the scope that <function>get_defined_vars</function> is
+ called. As of PHP 5, the $GLOBALS variable is included in the results of
+ the array returned.
</para>
<para>
<informalexample>
