diff options
| author | Felipe Pena <felipensp@gmail.com> | 2014-05-10 11:55:48 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2014-05-10 11:55:48 -0300 |
| commit | ece7421864354b11e93a2b49f1409cceebd1225e (patch) | |
| tree | badec683bbca0ec9abee9a67d8380bf0ab9e46b4 /ext/simplexml | |
| parent | c54b9f7b7226394dedc8ebef684e688041598d37 (diff) | |
| parent | 16b293de506533805765a8617f2edf63a6b3c2e2 (diff) | |
| download | php-git-ece7421864354b11e93a2b49f1409cceebd1225e.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Move checking
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/simplexml.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 13938f53fb..a915862ec4 100644 --- a/ext/simplexml/simplexml.c +++ b/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); |