diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 04:13:34 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-28 04:13:34 +0300 |
| commit | 6499162ff0d8aa6e862d3e3cdd2288b87636b8a1 (patch) | |
| tree | b1de28564ceb5249bd207a6291fff0ab3dac877f /Zend/zend_ini_parser.y | |
| parent | 8339222106ac38090e9790f1abbbe2c70c1840fd (diff) | |
| download | php-git-6499162ff0d8aa6e862d3e3cdd2288b87636b8a1.tar.gz | |
- get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
Diffstat (limited to 'Zend/zend_ini_parser.y')
| -rw-r--r-- | Zend/zend_ini_parser.y | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index ae04d2b70c..315455bf88 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -134,7 +134,7 @@ static void zend_ini_get_constant(zval *result, zval *name) if (Z_TYPE_P(c) != IS_STRING) { ZVAL_COPY_VALUE(&tmp, c); if (Z_OPT_CONSTANT(tmp)) { - zval_update_constant_ex(&tmp, 1, NULL); + zval_update_constant_ex(&tmp, NULL); } zval_opt_copy_ctor(&tmp); convert_to_string(&tmp); |