diff options
| author | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2013-10-15 22:38:46 +0000 |
| commit | 29e755ac6669fa1801bf1e1c1e6acee8d78c9498 (patch) | |
| tree | fa033f900da9649cf5064c7a9d2a4a8916403ee1 /Zend/zend.c | |
| parent | 8495d6303400edd9b84a6febd2a6b62b38e11c97 (diff) | |
| parent | b0a36007abb522b6b1e3a6b3108eb726053b9d72 (diff) | |
| download | php-git-29e755ac6669fa1801bf1e1c1e6acee8d78c9498.tar.gz | |
Merge branch 'PHP-5.4' into JSONWhitespaceFix
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 162922866b..0602c45042 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1183,7 +1183,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ * such scripts recursivly, but some CG() variables may be * inconsistent. */ - in_compilation = zend_is_compiling(TSRMLS_C); + in_compilation = CG(in_compilation); if (in_compilation) { saved_class_entry = CG(active_class_entry); CG(active_class_entry) = NULL; @@ -1195,6 +1195,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ SAVE_STACK(declare_stack); SAVE_STACK(list_stack); SAVE_STACK(context_stack); + CG(in_compilation) = 0; } if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) { @@ -1219,6 +1220,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ RESTORE_STACK(declare_stack); RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); + CG(in_compilation) = 1; } if (!EG(user_error_handler)) { |