From 0007231452f2e3c1e705c40ca58e01045fb4372d Mon Sep 17 00:00:00 2001 From: mwilliams Date: Mon, 3 Jun 2013 17:29:37 -0700 Subject: [PATCH] Fix spew from hphp when it tries to constant-fold php-builtins trigger_error bypasses the usual error handling, so explicitly test for throwAllErrors. --- hphp/runtime/ext/ext_error.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/hphp/runtime/ext/ext_error.cpp b/hphp/runtime/ext/ext_error.cpp index 7c687dbb3..02aaa5a86 100644 --- a/hphp/runtime/ext/ext_error.cpp +++ b/hphp/runtime/ext/ext_error.cpp @@ -164,6 +164,7 @@ void f_hphp_clear_unflushed() { bool f_trigger_error(CStrRef error_msg, int error_type /* = k_E_USER_NOTICE */) { std::string msg = error_msg.data(); + if (g_context->getThrowAllErrors()) throw error_type; if (error_type == k_E_USER_ERROR) { g_context->handleError(msg, error_type, true, ExecutionContext::ThrowIfUnhandled,