diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 15:23:06 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-25 15:23:06 +0400 |
| commit | b965647e44c4574ba4c22bfc92b5b7f587451c9d (patch) | |
| tree | 2d0a144c7156edcbdca88b626ddd19447b87f0fb /Zend/zend_execute_API.c | |
| parent | cabfbf712850d31081f7a9d0ebe03576b6ae980b (diff) | |
| parent | 40a9132de8337f95aba153a5a6fcdb43eb02f681 (diff) | |
| download | php-git-b965647e44c4574ba4c22bfc92b5b7f587451c9d.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Conflicts:
Zend/zend_object_handlers.c
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 7fb89bc046..425a04756b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -371,10 +371,10 @@ ZEND_API const char *get_active_function_name(TSRMLS_D) /* {{{ */ } switch (EG(current_execute_data)->function_state.function->type) { case ZEND_USER_FUNCTION: { - const char *function_name = ((zend_op_array *) EG(current_execute_data)->function_state.function)->function_name->val; + zend_string *function_name = ((zend_op_array *) EG(current_execute_data)->function_state.function)->function_name; if (function_name) { - return function_name; + return function_name->val; } else { return "main"; } |