diff options
author | Dmitry Stogov <dmitry@zend.com> | 2014-05-30 11:13:19 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2014-05-30 11:13:19 +0400 |
commit | d2020cd91ba2c16caa49e6c54f334bd046d607a5 (patch) | |
tree | c09dc6019f7fb387e7f1e4f2358f48cea9938e36 | |
parent | 984c8f87d2ca3840c3d3551713e1eff15aedd712 (diff) | |
parent | 9f70b2f6fa2d5e2679892d9a845d785096e8ff43 (diff) | |
download | php-git-d2020cd91ba2c16caa49e6c54f334bd046d607a5.tar.gz |
Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
typo
Revert "Fix ArrayObject with immutable array"
Fix ArrayObject with immutable array
-rw-r--r-- | Zend/zend_compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index e1a4da0f73..ea75c1503a 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -7499,7 +7499,7 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC) /* {{{ */ Z_TYPE_FLAGS_P(zv) = IS_TYPE_IMMUTABLE; Z_ARRVAL_P(zv)->u.flags &= ~HASH_FLAG_APPLY_PROTECTION; - /* store as an anounimus constant */ + /* store as an anonymous constant */ c = emalloc(sizeof(zend_constant)); ZVAL_COPY_VALUE(&c->value, zv); c->flags = 0; |