ZE2 compatibility fixes

diff --git a/ext/standard/aggregation.c b/ext/standard/aggregation.c
index 0bed0a50c8d8aad40f181940c69598a33f983691..b45d2b8d9bf8a245847e2850e6297ab4a0655e6e 100644 (file)
--- a/ext/standard/aggregation.c
+++ b/ext/standard/aggregation.c
@@ -408,7 +408,8 @@ static void aggregate(INTERNAL_FUNCTION_PARAMETERS, int aggr_what, int aggr_type
                 * and stuff this where it belongs so we don't have to work so hard next
                 * time.
                 */
-               Z_OBJCE_P(obj) = new_ce;
+               /* OBJECT FIXME!! won't work with non-standard objects */
+               Z_OBJ_P(obj)->ce = new_ce;
                aggr_info_new.new_ce = new_ce;
                MAKE_STD_ZVAL(aggr_info_new.aggr_members);
                array_init(aggr_info_new.aggr_members);
@@ -628,7 +629,8 @@ PHP_FUNCTION(deaggregate)
                        }
                }
 
-               Z_OBJCE_P(obj) = orig_ce;
+               /* OBJECT FIXME!! won't work with non-standard objects */
+               Z_OBJ_P(obj)->ce = orig_ce;
                zend_hash_index_del(BG(aggregation_table), (long)obj);
        }
 }