Return same c_DOMElement object when calling getElementById multiple …

…times Should fix #2109 Closes #2314 Reviewed By: @fredemmott Differential Revision: D1260361
facebook · Apr 8, 2014 · b568bf9 · b568bf9
1 parent 507304c
commit b568bf9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp
@@ -3337,10 +3337,14 @@ Variant c_DOMDocument::t_createtextnode(const String& data) {
 Variant c_DOMDocument::t_getelementbyid(const String& elementid) {
   xmlDocPtr docp = (xmlDocPtr)m_node;
   xmlAttrPtr attrp = xmlGetID(docp, (xmlChar*)elementid.data());
+  if (attrp && attrp->_private) {
+    return static_cast<c_DOMElement*>(attrp->_private);
+  }
   if (attrp && attrp->parent) {
     c_DOMElement *ret = NEWOBJ(c_DOMElement)();
     ret->m_doc = this;
     ret->m_node = attrp->parent;
+    attrp->_private = static_cast<void*>(ret);
     return ret;
   }
   return uninit_null();

diff --git a/hphp/test/slow/dom_document/2109.php b/hphp/test/slow/dom_document/2109.php
@@ -0,0 +1,12 @@
+<?php
+$dom = new \DOMDocument();
+$dom->loadHTML('
+<html>
+  <form id="form-1" action="" method="POST">
+  </form>
+  <form id="form_2" action="" method="POST">
+  </form>
+</html>');
+$form1 = $dom->getElementById('form_2');
+$form2 = $dom->getElementById('form_2');
+var_dump(spl_object_hash($form1) === spl_object_hash($form2));
diff --git a/hphp/test/slow/dom_document/2109.php.expect b/hphp/test/slow/dom_document/2109.php.expect
@@ -0,0 +1 @@
+bool(true)