mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
mlanthaler: Don't show a error message and don't quit the script when the error was expected (statement with an @ in front to suppress the error). (merged from branches/gsoc)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41730 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
a377a67e54
commit
daca02b9a7
@ -98,8 +98,10 @@ class Debug {
|
|||||||
if(self::$send_warnings_to) self::emailError(self::$send_warnings_to, $errno, $errstr, $errfile, $errline, $errcontext, "Warning");
|
if(self::$send_warnings_to) self::emailError(self::$send_warnings_to, $errno, $errstr, $errfile, $errline, $errcontext, "Warning");
|
||||||
|
|
||||||
if(Director::isDev()) {
|
if(Director::isDev()) {
|
||||||
self::showError($errno, $errstr, $errfile, $errline, $errcontext);
|
if(error_reporting() != 0) { // otherwise the error was suppressed with @
|
||||||
die();
|
self::showError($errno, $errstr, $errfile, $errline, $errcontext);
|
||||||
|
die();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user