From 8797aa99b70e0deaf126a9b10ba26b81bcdd3017 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Wed, 31 Dec 2008 13:25:21 +0000
Subject: [PATCH] MFH - Register engine classes when and where they should be -
 Show core module version as PHP version

---
 Zend/zend_builtin_functions.c |  2 ++
 main/main.c                   | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 46d25d25a8c..089073443bc 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -292,6 +292,8 @@ ZEND_MINIT_FUNCTION(core) { /* {{{ */
 	INIT_CLASS_ENTRY(class_entry, "stdClass", NULL);
 	zend_standard_class_def = zend_register_internal_class(&class_entry TSRMLS_CC);
 
+	zend_register_default_classes(TSRMLS_C);
+
 	return SUCCESS;
 }
 /* }}} */
diff --git a/main/main.c b/main/main.c
index 67287c06754..2e6bffd96db 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1606,6 +1606,14 @@ static void core_globals_dtor(php_core_globals *core_globals TSRMLS_DC)
 }
 /* }}} */
 
+PHP_MINFO_FUNCTION(php_core) { /* {{{ */
+	php_info_print_table_start();
+	php_info_print_table_row(2, "PHP Version", PHP_VERSION);
+	php_info_print_table_end(); 
+	DISPLAY_INI_ENTRIES();
+}
+/* }}} */
+
 /* {{{ php_register_extensions
  */
 int php_register_extensions(zend_module_entry **ptr, int count TSRMLS_DC)
@@ -1663,6 +1671,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	zend_utility_values zuv;
 	int module_number=0;	/* for REGISTER_INI_ENTRIES() */
 	char *php_os;
+	zend_module_entry *module;
 #ifdef ZTS
 	zend_executor_globals *executor_globals;
 	void ***tsrm_ls;
@@ -1875,9 +1884,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 		return FAILURE;
 	}
 
-	/* Register internal Zend classes */
-	zend_register_default_classes(TSRMLS_C);
-
 	/* startup extensions staticly compiled in */
 	if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
 		php_printf("Unable to start builtin modules\n");
@@ -1904,6 +1910,12 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
 	/* start Zend extensions */
 	zend_startup_extensions();
 
+	/* make core report what it should */
+	if (zend_hash_find(&module_registry, "core", sizeof("core"), (void**)&module)==SUCCESS) {
+		module->version = PHP_VERSION;
+		module->info_func = PHP_MINFO(php_core);
+	}
+
 #ifdef ZTS
 	zend_post_startup(TSRMLS_C);
 #endif