summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2014-05-10 11:55:45 -0300
committerFelipe Pena <felipensp@gmail.com>2014-05-10 11:55:45 -0300
commit16b293de506533805765a8617f2edf63a6b3c2e2 (patch)
tree491fe7e345bf5ea331b4960a99ae4c574cd51403
parent8bea8cf9cd65f6b4d4093ea7c68a19a588c7fbd0 (diff)
parentc575ab0c8856906d184b10d607f7b06c27d4cd5f (diff)
downloadphp-git-16b293de506533805765a8617f2edf63a6b3c2e2.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: - Move checking
-rw-r--r--ext/simplexml/simplexml.c6
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);