From 22c05e49caf450e747cb101a3943f8d2b209fc22 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sat, 23 Oct 2010 05:30:55 +0000
Subject: [PATCH] Fixed bug #49490 (XPath namespace prefix conflict)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@304636 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/dom/domxpath/evaluate.xml | 35 ++++++++++++++++++++++++++++-
 reference/dom/domxpath/query.xml    | 35 ++++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/reference/dom/domxpath/evaluate.xml b/reference/dom/domxpath/evaluate.xml
index 116a497e72..2293ac9a11 100644
--- a/reference/dom/domxpath/evaluate.xml
+++ b/reference/dom/domxpath/evaluate.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <type>mixed</type><methodname>DOMXPath::evaluate</methodname>
    <methodparam><type>string</type><parameter>expression</parameter></methodparam>
-   <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>      
+   <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>
+   <methodparam choice="opt"><type>boolean</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Executes the given XPath <parameter>expression</parameter> and returns
@@ -41,6 +42,15 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>registerNodeNS</parameter></term>
+     <listitem>
+      <para>
+       The optional <parameter>registerNodeNS</parameter> can be specified to 
+       disable automatic registration of the context node.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
@@ -51,6 +61,29 @@
    containing all nodes matching the given XPath <parameter>expression</parameter>. 
   </para>
  </refsect1>
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>5.3.3</entry>
+       <entry>
+         The <parameter>registerNodeNS</parameter> parameter was added.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
   <para>
diff --git a/reference/dom/domxpath/query.xml b/reference/dom/domxpath/query.xml
index e058f5c411..2495adff8d 100644
--- a/reference/dom/domxpath/query.xml
+++ b/reference/dom/domxpath/query.xml
@@ -12,7 +12,8 @@
   <methodsynopsis>
    <type>DOMNodeList</type><methodname>DOMXPath::query</methodname>
    <methodparam><type>string</type><parameter>expression</parameter></methodparam>
-   <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>      
+   <methodparam choice="opt"><type>DOMNode</type><parameter>contextnode</parameter></methodparam>
+   <methodparam choice="opt"><type>boolean</type><parameter>registerNodeNS</parameter><initializer>true</initializer></methodparam>
   </methodsynopsis>
   <para>
    Executes the given XPath <parameter>expression</parameter>.
@@ -40,6 +41,15 @@
       </para>
      </listitem>
     </varlistentry>
+    <varlistentry>
+     <term><parameter>registerNodeNS</parameter></term>
+     <listitem>
+      <para>
+       The optional <parameter>registerNodeNS</parameter> can be specified to 
+       disable automatic registration of the context node.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
   </para>
  </refsect1>
@@ -51,6 +61,29 @@
    not return nodes will return an empty <classname>DOMNodeList</classname>.
   </para>
  </refsect1>
+ <refsect1 role="changelog">
+  &reftitle.changelog;
+  <para>
+   <informaltable>
+    <tgroup cols="2">
+     <thead>
+      <row>
+       <entry>&Version;</entry>
+       <entry>&Description;</entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry>5.3.3</entry>
+       <entry>
+         The <parameter>registerNodeNS</parameter> parameter was added.
+       </entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </informaltable>
+  </para>
+ </refsect1>
  <refsect1 role="examples">
   &reftitle.examples;
   <para>