diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
| commit | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (patch) | |
| tree | 8fdd3343db9b3a7345ded20de1b20da68bcc1705 /Zend/zend_objects.c | |
| parent | 63c057e3313918a800ad7faebdb648216ddba4c0 (diff) | |
| download | php-git-0a77dcd4b9046adb7c8f719ded19c5eff0c8976a.tar.gz | |
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 1ef0e1d7e7..af0070c5fb 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -77,11 +77,11 @@ ZEND_API void zend_objects_destroy_object(zend_object *object TSRMLS_DC) if (object->ce != EG(scope)) { zend_class_entry *ce = object->ce; - zend_error(EG(in_execution) ? E_ERROR : E_WARNING, + zend_error(EG(current_execute_data) ? E_ERROR : E_WARNING, "Call to private %s::__destruct() from context '%s'%s", ce->name->val, EG(scope) ? EG(scope)->name->val : "", - EG(in_execution) ? "" : " during shutdown ignored"); + EG(current_execute_data) ? "" : " during shutdown ignored"); return; } } else { @@ -90,11 +90,11 @@ ZEND_API void zend_objects_destroy_object(zend_object *object TSRMLS_DC) if (!zend_check_protected(zend_get_function_root_class(destructor), EG(scope))) { zend_class_entry *ce = object->ce; - zend_error(EG(in_execution) ? E_ERROR : E_WARNING, + zend_error(EG(current_execute_data) ? E_ERROR : E_WARNING, "Call to protected %s::__destruct() from context '%s'%s", ce->name->val, EG(scope) ? EG(scope)->name->val : "", - EG(in_execution) ? "" : " during shutdown ignored"); + EG(current_execute_data) ? "" : " during shutdown ignored"); return; } } |