renamed registerNamespace() to registerXPathNamespace()

diff --git a/NEWS b/NEWS
index 7a48461c75d1a2d49e51d7c3a522f30b88839892..2431c1b58434015583d27c6136abefed24ebef4c 100644 (file)
--- 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 c5ec233a234e58b09fc67e3fc72813f4faaca518..1c78b054bfd463af9d23aba20e493580e4d89d38 100644 (file)
--- 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}