← Back to branch summary

~legolas/ubuntu/natty/php5/5.3.5

« back to all changes in this revision

Viewing changes to Zend/zend_API.c

  • Committer: Stas Verberkt
  • Date: 2011-02-01 09:27:15 UTC
  • Revision ID: legolas@legolasweb.nl-20110201092715-yq052iu2yl4i2eyg
Inserted PHP 5.3.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Zend/zend_API.c
18
18
   +----------------------------------------------------------------------+
19
19
*/
20
20
 
21
 
/* $Id: zend_API.c 299395 2010-05-14 23:48:03Z felipe $ */
 
21
/* $Id: zend_API.c 302137 2010-08-12 07:58:14Z sas $ */
22
22
 
23
23
#include "zend.h"
24
24
#include "zend_execute.h"
1082
1082
                } else {
1083
1083
                        ALLOC_HASHTABLE_REL(object->properties);
1084
1084
                        zend_hash_init(object->properties, zend_hash_num_elements(&class_type->default_properties), NULL, ZVAL_PTR_DTOR, 0);
1085
 
                        zend_hash_copy(object->properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 
1085
                        zend_hash_copy(object->properties, &class_type->default_properties, zval_copy_property_ctor(class_type), (void *) &tmp, sizeof(zval *));
1086
1086
                }
1087
1087
        } else {
1088
1088
                Z_OBJVAL_P(arg) = class_type->create_object(class_type TSRMLS_CC);