Index: incomplete_class.c
===================================================================
RCS file: /repository/php-src/ext/standard/incomplete_class.c,v
retrieving revision 1.24
diff -u -b -r1.24 incomplete_class.c
--- incomplete_class.c	7 Apr 2004 08:06:09 -0000	1.24
+++ incomplete_class.c	5 Sep 2004 12:27:09 -0000
@@ -35,14 +35,12 @@
 
 /* {{{ incomplete_class_message
  */
-static void incomplete_class_message(int error_type TSRMLS_DC)
+static void incomplete_class_message(zval *object, int error_type TSRMLS_DC)
 {
 	char buf[1024];
 	char *class_name = NULL;
 
-	if(EG(This)) {
-		class_name = php_lookup_class_name(EG(This), NULL);
-	}
+	class_name = php_lookup_class_name(object, NULL);
 	
 	if (!class_name) {
 		class_name = estrndup("unknown", sizeof("unknown")-1);
@@ -58,7 +56,7 @@
 
 static zval *incomplete_class_get_property(zval *object, zval *member, int type TSRMLS_DC)
 {
-	incomplete_class_message(E_NOTICE TSRMLS_CC);
+	incomplete_class_message(object, E_NOTICE TSRMLS_CC);
 	if(type == BP_VAR_W || type == BP_VAR_RW) {
 		return EG(error_zval_ptr);
 	} else {
@@ -68,28 +66,28 @@
 
 static void incomplete_class_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
 {
-	incomplete_class_message(E_NOTICE TSRMLS_CC);
+	incomplete_class_message(object, E_NOTICE TSRMLS_CC);
 }
 	
 static zval **incomplete_class_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC)
 {
-	incomplete_class_message(E_NOTICE TSRMLS_CC);
+	incomplete_class_message(object, E_NOTICE TSRMLS_CC);
 	return &EG(error_zval_ptr);
 }
 
 static void incomplete_class_unset_property(zval *object, zval *member TSRMLS_DC)
 {
-	incomplete_class_message(E_NOTICE TSRMLS_CC);
+	incomplete_class_message(object, E_NOTICE TSRMLS_CC);
 }
 
 static int incomplete_class_has_property(zval *object, zval *member, int check_empty TSRMLS_DC)
 {
-	incomplete_class_message(E_NOTICE TSRMLS_CC);
+	incomplete_class_message(object, E_NOTICE TSRMLS_CC);
 	return 0;
 }
 
 static union _zend_function *incomplete_class_get_method(zval *object, char *method, int method_len TSRMLS_DC) {
-	incomplete_class_message(E_ERROR TSRMLS_CC);
+	incomplete_class_message(object, E_ERROR TSRMLS_CC);
 	return NULL;
 }