Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Move checking
This commit is contained in:
Felipe Pena 2014-05-10 11:55:48 -03:00
commit ece7421864

View file

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