svn: /phpdoc/ru/trunk/reference/array/functions/ array-diff.xml array-intersect-assoc.xml
| From: | Shein Alexey | Date: | Tue, 02 Aug 2011 12:07:42 +0000 |
| Subject: | svn: /phpdoc/ru/trunk/reference/array/functions/ array-diff.xml array-intersect-assoc.xml | ||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-2081@lists.php.net to get a copy of this message | ||
shein Tue, 02 Aug 2011 12:07:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314094
Log:
Updated translation.
Changed paths:
U phpdoc/ru/trunk/reference/array/functions/array-diff.xml
U phpdoc/ru/trunk/reference/array/functions/array-intersect-assoc.xml
Modified: phpdoc/ru/trunk/reference/array/functions/array-diff.xml
===================================================================
--- phpdoc/ru/trunk/reference/array/functions/array-diff.xml 2011-08-02 10:31:06 UTC (rev 314093)
+++ phpdoc/ru/trunk/reference/array/functions/array-diff.xml 2011-08-02 12:07:42 UTC (rev 314094)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 314089 Maintainer: shein Status: ready -->
<!-- Reviewed: no -->
<!-- $Revision$ -->
<refentry xml:id="function.array-diff" xmlns="http://docbook.org/ns/docbook">
@@ -14,7 +14,7 @@
<type>array</type><methodname>array_diff</methodname>
<methodparam><type>array</type><parameter>array1</parameter></methodparam>
<methodparam><type>array</type><parameter>array2</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>
...</parameter></methodparam>
+ <methodparam
choice="opt"><type>array</type><parameter>...</parameter></methodparam>
</methodsynopsis>
<para>
Сравнивает <parameter>array1</parameter> с
<parameter>array2</parameter>
Modified: phpdoc/ru/trunk/reference/array/functions/array-intersect-assoc.xml
===================================================================
--- phpdoc/ru/trunk/reference/array/functions/array-intersect-assoc.xml 2011-08-02 10:31:06 UTC (rev
314093)
+++ phpdoc/ru/trunk/reference/array/functions/array-intersect-assoc.xml 2011-08-02 12:07:42 UTC (rev
314094)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- EN-Revision: 297028 Maintainer: shein Status: ready -->
+<!-- EN-Revision: 314091 Maintainer: shein Status: ready -->
<!-- Reviewed: no -->
<!-- $Revision$ -->
<refentry xmlns="http://docbook.org/ns/docbook"
xml:id="function.array-intersect-assoc">
@@ -74,7 +74,7 @@
<![CDATA[
<?php
$array1 = array("a" => "green", "b" => "brown",
"c" => "blue", "red");
-$array2 = array("a" => "green", "yellow", "red");
+$array2 = array("a" => "green", "b" => "yellow",
"blue", "red");
$result_array = array_intersect_assoc($array1, $array2);
print_r($result_array);
?>
@@ -97,7 +97,8 @@
Значение <literal>"red"</literal> не возвращается,
потому что в массиве
<varname>$array1</varname> его ключ - <literal>0</literal>, в
то время как
ключ значения "red" в массиве
<varname>$array2</varname> -
- <literal>1</literal>.
+ <literal>1</literal>, а ключ <literal>"b"</literal> не
возвращается
+ потому, что его значения различны в каждом массиве.
</simpara>
<simpara>
Два значения пар <literal>key => value</literal>