Browse Source

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Move checking
pull/675/head
Felipe Pena 12 years ago
parent
commit
ece7421864
  1. 6
      ext/simplexml/simplexml.c

6
ext/simplexml/simplexml.c

@ -1269,9 +1269,9 @@ SXE_METHOD(xpath)
}
if (!sxe->node) {
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, xmlDocGetRootElement((xmlDocPtr) sxe->document->ptr), NULL TSRMLS_CC);
}
if (!sxe->node) {
RETURN_FALSE;
if (!sxe->node) {
RETURN_FALSE;
}
}
nodeptr = php_sxe_get_first_node(sxe, sxe->node->node TSRMLS_CC);

Loading…
Cancel
Save