Patch diff_of_zend_compile.c for Compile Warning Bug #63336

Patch version 2012-10-23 02:30 UTC

• 2012-10-23 02:30 UTC [diff to current]

Developer: tomoya-yokota@cybozu.co.jp

--- php-5.4.8.org/Zend/zend_compile.c	2012-10-16 19:05:41.000000000 +0900
+++ php-5.4.8/Zend/zend_compile.c	2012-10-23 10:29:53.667669001 +0900
@@ -3267,7 +3267,7 @@
 		if (!zend_do_perform_implementation_check(child, child->common.prototype TSRMLS_CC)) {
 			zend_error(E_COMPILE_ERROR, "Declaration of %s::%s() must be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC)); 
 		}
-	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler)) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
+	} else if (EG(error_reporting) & E_STRICT || EG(user_error_handler_error_reporting) & E_STRICT ) { /* Check E_STRICT (or custom error handler) before the check so that we save some time */
 		if (!zend_do_perform_implementation_check(child, parent TSRMLS_CC)) {
 			char *method_prototype = zend_get_function_declaration(child->common.prototype? child->common.prototype : parent TSRMLS_CC);
 			zend_error(E_STRICT, "Declaration of %s::%s() should be compatible with %s", ZEND_FN_SCOPE_NAME(child), child->common.function_name, method_prototype);