From: Stanislav Malyshev <stas@php.net>
Date: Sun, 12 Jan 2003 14:43:04 +0000 (+0000)
Subject: Disable ZE2-incompatible parts
X-Git-Tag: PHP_5_0_dev_before_13561_fix~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7e14749e7d0cf9ac23c6f25c18e78c1a1b0e377;p=php

Disable ZE2-incompatible parts
# This should be rewritten for ZE2 anyway...
---

diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 77ba6a26d8..0173ae14e7 100644
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -409,7 +409,9 @@ static void aggregate(INTERNAL_FUNCTION_PARAMETERS, int aggr_what, int aggr_type
 		 * time.
 		 */
 		/* OBJECT FIXME!! won't work with non-standard objects */
+#ifndef ZEND_ENGINE_2
 		(Z_OBJ_P(obj))->ce = new_ce;
+#endif		
 		aggr_info_new.new_ce = new_ce;
 		MAKE_STD_ZVAL(aggr_info_new.aggr_members);
 		array_init(aggr_info_new.aggr_members);
@@ -630,7 +632,9 @@ PHP_FUNCTION(deaggregate)
 		}
 
 		/* OBJECT FIXME!! won't work with non-standard objects */
+#ifndef ZEND_ENGINE_2
 		(Z_OBJ_P(obj))->ce = orig_ce;
+#endif		
 		zend_hash_index_del(BG(aggregation_table), (long)obj);
 	}
 }