diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 5f51d71028..ff85af9061 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -442,6 +442,7 @@ static void register_standard_class(TSRMLS_D) /* {{{ */ zend_initialize_class_data(zend_standard_class_def, 1 TSRMLS_CC); zend_hash_add(CG(class_table), "stdclass", sizeof("stdclass"), &zend_standard_class_def, sizeof(zend_class_entry *), NULL); + zend_standard_class_def->module = EG(current_module); } /* }}} */ @@ -698,6 +699,10 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i EG(user_error_handler) = NULL; EG(user_exception_handler) = NULL; #endif + if (start_builtin_functions) { + zend_startup_builtin_functions(TSRMLS_C); + } + register_standard_class(TSRMLS_C); zend_register_standard_constants(TSRMLS_C); zend_register_auto_global("GLOBALS", sizeof("GLOBALS") - 1, NULL TSRMLS_CC); @@ -707,10 +712,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_init_exception_op(TSRMLS_C); #endif - if (start_builtin_functions) { - zend_startup_builtin_functions(TSRMLS_C); - } - zend_ini_startup(TSRMLS_C); #ifdef ZTS |