jan             Tue May  4 15:01:46 2004 EDT

  Modified files:              
    /phpdoc/en/reference/array/functions        array-merge.xml 
  Log:
   - reflect the fact, that merging a single array is possible
     and added a corresponding example. Thanks to vmx.
  
  
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-merge.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/reference/array/functions/array-merge.xml
diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.12 
phpdoc/en/reference/array/functions/array-merge.xml:1.13
--- phpdoc/en/reference/array/functions/array-merge.xml:1.12    Mon Jan  5 05:29:53 
2004
+++ phpdoc/en/reference/array/functions/array-merge.xml Tue May  4 15:01:46 2004
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-merge">
    <refnamediv>
     <refname>array_merge</refname>
-    <refpurpose>Merge two or more arrays</refpurpose>
+    <refpurpose>Merge one or more arrays</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>array_merge</methodname>
       <methodparam><type>array</type><parameter>array1</parameter></methodparam>
-      <methodparam><type>array</type><parameter>array2</parameter></methodparam>
+      <methodparam 
choice="opt"><type>array</type><parameter>array2</parameter></methodparam>
       <methodparam 
choice="opt"><type>array</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>array_merge</function> merges the elements of two or
+     <function>array_merge</function> merges the elements of one or
      more arrays together so that the values of one are appended to
      the end of the previous one.  It returns the resulting array.
     </para>
@@ -27,6 +27,11 @@
      appended.
     </para>
     <para>
+     If only one array is given and the array is numerically indexed, the
+     keys get reindexed in a continuous way. For associative arrays, duplicate
+     entries will be merged into the last one. See example three for details.
+    </para>
+    <para>
      <example>
       <title><function>array_merge</function> example</title>
       <programlisting role="php">
@@ -106,6 +111,43 @@
 ]]>
       </screen>
      </example>
+     <example>
+      <title><function>array_merge</function> example</title>
+      <programlisting role="php">
+<![CDATA[
+<?php
+$array_one = array(0 => "jay", 1 => "bob", 2 => "randal", 3 => "dante");
+$array_two = array("jay" => "bob", "randal" => "dante", "jay" => "jason");
+
+unset($array_one[2]);
+
+$result_one = array_merge($array_one);
+$result_two = array_merge($array_two);
+
+print_r($result_one);
+print_r($result_two);
+?>
+]]>
+      </programlisting>
+      <para>
+       The output is: 
+      </para>
+      <screen role="php">
+<![CDATA[
+Array
+(
+    [0] => jay
+    [1] => bob
+    [2] => dante
+)
+Array
+(
+    [jay] => jason
+    [randal] => dante
+)
+]]>
+      </screen>
+     </example>
     </para>
     <note>
      <para>

Reply via email to