diff options
author | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
---|---|---|
committer | Jakub Zelenka <bukka@php.net> | 2015-02-02 19:53:32 +0000 |
commit | 3e4c1717ee4f4beb9c362942a113b90fff0a7fb0 (patch) | |
tree | f5da1649f6cfb5ae06b09b9cab4fd19a4446a767 /ext/intl/formatter/formatter_main.c | |
parent | b65205028a2debc50c3e2ca1572da4c74ac87834 (diff) | |
parent | 92576c7c49a3c104bc4aea4cfa378a029bb26c86 (diff) | |
download | php-git-3e4c1717ee4f4beb9c362942a113b90fff0a7fb0.tar.gz |
Merge branch 'master' into jsond
Diffstat (limited to 'ext/intl/formatter/formatter_main.c')
-rw-r--r-- | ext/intl/formatter/formatter_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c index 59629a68f9..60db673ff2 100644 --- a/ext/intl/formatter/formatter_main.c +++ b/ext/intl/formatter/formatter_main.c @@ -97,7 +97,6 @@ PHP_METHOD( NumberFormatter, __construct ) if (Z_TYPE_P(return_value) == IS_OBJECT && Z_OBJ_P(return_value) == NULL) { zend_object_store_ctor_failed(Z_OBJ(orig_this)); - zval_dtor(&orig_this); ZEND_CTOR_MAKE_NULL(); } } |