diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-04-30 06:49:25 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-04-30 06:49:25 +0100 |
| commit | 436b26c70bfe44aff6367d85e1a50e497e58dc05 (patch) | |
| tree | b65650934c86f1be8f9ea6ec87bc85cf693f29f4 /ext/standard/basic_functions.c | |
| parent | 9ad40d8d36b3a481ab20f793e34d0d35148c07f5 (diff) | |
| parent | 01df044fd54ee6728ef3b10dd073ca6c2750fd77 (diff) | |
| download | php-git-436b26c70bfe44aff6367d85e1a50e497e58dc05.tar.gz | |
Merge branch 'master' of https://github.com/php/php-src
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 0481e41a6e..f887903f26 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3843,13 +3843,12 @@ PHP_FUNCTION(constant) scope = zend_get_executed_scope(); c = zend_get_constant_ex(const_name, scope, ZEND_FETCH_CLASS_SILENT); if (c) { - ZVAL_COPY_VALUE(return_value, c); + ZVAL_DUP(return_value, c); if (Z_CONSTANT_P(return_value)) { if (UNEXPECTED(zval_update_constant_ex(return_value, scope) != SUCCESS)) { return; } } - zval_copy_ctor(return_value); } else { php_error_docref(NULL, E_WARNING, "Couldn't find constant %s", ZSTR_VAL(const_name)); RETURN_NULL(); |