com php-src: - Fixed conflict: ext/dom/xpath.c
| From: | Felipe Pena | Date: | Sat, 14 Jul 2012 16:16:35 +0000 |
| Subject: | com php-src: - Fixed conflict: ext/dom/xpath.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69583@lists.php.net to get a copy of this message | ||
Commit: d640e446abfacb65d2d516f38f93c2d8001aefbb
Author: Felipe Pena <felipensp@gmail.com> Sat, 14 Jul 2012 13:16:35 -0300
Parents: 9c2839306776bfb3cb68fb6c56f1ef926daa070e 864575251ac85176b763a56b35c2da298e0d0fa7
Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d640e446abfacb65d2d516f38f93c2d8001aefbb
Log:
- Fixed conflict
Changed paths:
MM ext/dom/xpath.c
Diff:
diff --cc ext/dom/xpath.c
index 70e7aff,b5a31d7..3428546
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@@ -329,7 -330,9 +330,10 @@@ int dom_xpath_document_read(dom_object
}
ALLOC_ZVAL(*retval);
+ tmp = *retval;
- if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj
TSRMLS_CC))) {
++
+ if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, *retval, obj
TSRMLS_CC))) {
+ FREE_ZVAL(tmp);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object");
return FAILURE;
}