summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--ext/simplexml/simplexml.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 7a48461c75..2431c1b584 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,7 @@ PHP NEWS
. array_intersect_ukey() (Christiano Duarte)
. stream_context_get_default() (Wez)
. stream_socket_enable_crypto() (Wez)
- . SimpleXMLElement->registerNamespace() (Christian)
+ . SimpleXMLElement->registerXPathNamespace() (Christian)
- PHP will now respect extension dependencies when initializing. (Wez)
- Added Cursor support for MySQL 5.0.x in mysqli (Georg)
- Added proxy support to ftp wrapper via http. (Sara)
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index c5ec233a23..1c78b054bf 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -844,7 +844,7 @@ SXE_METHOD(xpath)
xmlXPathFreeObject(retval);
}
-SXE_METHOD(registerNamespace)
+SXE_METHOD(registerXPathNamespace)
{
php_sxe_object *sxe;
zval *id;
@@ -1627,7 +1627,7 @@ static zend_function_entry sxe_functions[] = {
SXE_ME(__construct, NULL, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL) /* must be called */
SXE_ME(asXML, NULL, ZEND_ACC_PUBLIC)
SXE_ME(xpath, NULL, ZEND_ACC_PUBLIC)
- SXE_ME(registerNamespace, NULL, ZEND_ACC_PUBLIC)
+ SXE_ME(registerXPathNamespace, NULL, ZEND_ACC_PUBLIC)
SXE_ME(attributes, NULL, ZEND_ACC_PUBLIC)
SXE_ME(children, NULL, ZEND_ACC_PUBLIC)
{NULL, NULL, NULL}