From: Sebastian Bergmann <sebastian@php.net>
Date: Mon, 2 Jun 2003 15:53:09 +0000 (+0000)
Subject: Leftover.
X-Git-Tag: RELEASE_1_0_2~455
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=572504845d8f56641bc6571fa10cfc33e0ef0598;p=php

Leftover.
---

diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 6853f316df..4168c2db92 100644
--- 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 21a741073f..57bd917a27 100644
--- 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 92f3e3b833..e06b789de3 100644
--- 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);