diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-14 19:27:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-14 19:27:55 +0800 |
| commit | c7513f58d23b0e1d2ff6e097c8b2df6098c5213f (patch) | |
| tree | 9a426bf79cb1639cf7f9596340bba86ae071091d /Zend/zend_constants.c | |
| parent | a975c7e0fe95a94c119eb1c8e519b2357aa50dcc (diff) | |
| parent | 703c1bc570d1fc9a379fa38b298d6759a4b1a687 (diff) | |
| download | php-git-c7513f58d23b0e1d2ff6e097c8b2df6098c5213f.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'Zend/zend_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index 8227f185d4..964c7f8165 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -379,6 +379,8 @@ ZEND_API int zend_get_constant_ex(const char *name, uint name_len, zval *result, if ((flags & ZEND_FETCH_CLASS_SILENT) == 0) { zend_error(E_ERROR, "Undefined class constant '%s::%s'", class_name->val, constant_name->val); } + } else if (Z_ISREF_P(ret_constant)) { + ret_constant = Z_REFVAL_P(ret_constant); } } else if (!ce) { retval = 0; |