Leftover.

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 6853f316dfaf40fc28131e95add5fd38370f9a52..4168c2db9273fc352a740bdfb4f597e7e5c8ce7e 100644 (file)
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -68,7 +68,6 @@ static inline void safe_free_zval_ptr(zval *p)
        }
 }
 ZEND_API int zend_lookup_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
-ZEND_API int zend_lookup_ns_class(char *name, int name_length, zend_class_entry ***ce TSRMLS_DC);
 ZEND_API int zend_eval_string(char *str, zval *retval_ptr, char *string_name TSRMLS_DC);
 
 static inline int i_zend_is_true(zval *op)

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 21a741073f8d42e217a71f8d967a0f4563e80cc8..57bd917a27277d7b58a314e6ea23d95dc986c97f 100644 (file)
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -429,7 +429,7 @@ yy22:
        
        do {
                /* Try to find class directly */
-               if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
+               if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
                        ce = *pce;
                        break;
                }
@@ -460,7 +460,7 @@ yy22:
                }
                
                /* The callback function may have defined the class */
-               if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
+               if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
                        ce = *pce;
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", user_func->value.str.val);

diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 92f3e3b833158a33ceac7a0f6802a2bd730743c5..e06b789de3226e7540fabe6c077334778f3196ee 100644 (file)
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -377,7 +377,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
        
        do {
                /* Try to find class directly */
-               if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
+               if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
                        ce = *pce;
                        break;
                }
@@ -408,7 +408,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
                }
                
                /* The callback function may have defined the class */
-               if (zend_lookup_ns_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
+               if (zend_lookup_class(class_name, len2, &pce TSRMLS_CC) == SUCCESS) {
                        ce = *pce;
                } else {
                        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Function %s() hasn't defined the class it was called for", user_func->value.str.val);