diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2014-06-16 11:16:33 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2014-06-16 11:16:33 +0200 |
| commit | e93f8e74d43d524a482ce43e5a62ca1980fe56c7 (patch) | |
| tree | 5cf53c6a23f77cb43acbe32dc89af06057b850be | |
| parent | 03ee0ddc5f705bcf0c88ade77d8b9aa8b9f68d57 (diff) | |
| parent | 0a3979e08b05a539090975c8bbda520438a1789e (diff) | |
| download | php-git-e93f8e74d43d524a482ce43e5a62ca1980fe56c7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 2fed17d7dd..0ac3bceddc 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -3336,7 +3336,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ *zv = *precv->op2.zv; zval_copy_ctor(zv); INIT_PZVAL(zv); - if (Z_TYPE_P(zv) == IS_CONSTANT) { + if ((Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT) { REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN_P(zv)); memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv)); offset += Z_STRLEN_P(zv); @@ -3362,7 +3362,7 @@ static char * zend_get_function_declaration(zend_function *fptr TSRMLS_DC) /* {{ *(offset++) = '.'; } *(offset++) = '\''; - } else if (Z_TYPE_P(zv) == IS_ARRAY || Z_TYPE_P(zv) == IS_CONSTANT_ARRAY) { + } else if (Z_TYPE_P(zv) == IS_ARRAY || (Z_TYPE_P(zv) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT_ARRAY) { memcpy(offset, "Array", 5); offset += 5; } else { |