php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Leftover.

Browse Source
This commit is contained in:
Sebastian Bergmann
2003-06-02 15:53:09 +00:00
parent 1fe874fbb8
commit 572504845d
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_execute.h
-1
View File
@@ -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)
ext/standard/var_unserializer.c
+2 -2
View File
@@ -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);
ext/standard/var_unserializer.re
+2 -2
View File
@@ -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);