Created
December 4, 2013 20:19
-
-
Save simonwelsh/7794776 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/hphp/runtime/base/runtime-error.h b/hphp/runtime/base/runtime-error.h | |
index fb7d3a2..b8f57e7 100644 | |
--- a/hphp/runtime/base/runtime-error.h | |
+++ b/hphp/runtime/base/runtime-error.h | |
@@ -57,7 +57,9 @@ public: | |
COMPILE_ERROR | COMPILE_WARNING | USER_ERROR | USER_WARNING | | |
USER_NOTICE | RECOVERABLE_ERROR | PHP_DEPRECATED | USER_DEPRECATED, | |
- HPHP_ALL = PHP_ALL | FATAL_ERROR | |
+ HPHP_ALL = PHP_ALL | FATAL_ERROR, | |
+ | |
+ HPHP_DEFAULT = HPHP_ALL & ~NOTICE & ~STRICT & ~PHP_DEPRECATED | |
}; | |
}; | |
diff --git a/hphp/runtime/base/runtime-option.cpp b/hphp/runtime/base/runtime-option.cpp | |
index c117581..7a6fc41 100644 | |
--- a/hphp/runtime/base/runtime-option.cpp | |
+++ b/hphp/runtime/base/runtime-option.cpp | |
@@ -67,7 +67,7 @@ bool RuntimeOption::EnableApplicationLog = true; | |
bool RuntimeOption::CallUserHandlerOnFatals = true; | |
bool RuntimeOption::ThrowExceptionOnBadMethodCall = true; | |
int RuntimeOption::RuntimeErrorReportingLevel = | |
- static_cast<int>(ErrorConstants::ErrorModes::HPHP_ALL); | |
+ static_cast<int>(ErrorConstants::ErrorModes::HPHP_DEFAULT); | |
std::string RuntimeOption::ServerUser; | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment