diff options
| author | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
|---|---|---|
| committer | George Wang <gwang@php.net> | 2014-10-03 16:43:58 -0400 |
| commit | 2fd7d60ea06aa07b99dc219655be7ab42b7e2e16 (patch) | |
| tree | 2835e4d2625870eb707e0361a769e4921aff8609 /ext/spl/php_spl.c | |
| parent | a7d2747890846ed68cc86c6e8d3fd005525ff0cc (diff) | |
| parent | e9b23401514a642b58084784305c1d19cf86a823 (diff) | |
| download | php-git-2fd7d60ea06aa07b99dc219655be7ab42b7e2e16.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/spl/php_spl.c')
| -rw-r--r-- | ext/spl/php_spl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index ad3bb85313..44078733d6 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -346,7 +346,7 @@ PHP_FUNCTION(spl_autoload) * The "scope" is determined by an opcode, if it is ZEND_FETCH_CLASS we know function was called indirectly by * the Zend engine. */ - zend_execute_data *ex = EG(current_execute_data); + zend_execute_data *ex = EX(prev_execute_data); while (ex && (!ex->func || !ZEND_USER_CODE(ex->func->type))) { ex = ex->prev_execute_data; |