aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-04-20 13:50:43 +0200
committerLukas Reschke <lukas@owncloud.com>2016-04-20 13:50:43 +0200
commitafad27fafd996f0e2e7117d9f431f9eb63736569 (patch)
treea85110bba245019f46496d6ec066830a82ce0dbd /lib/private
parentae27583fe2380ff05c7efb3dbe0719e6f7495921 (diff)
parentc609abf07522c9e1c90811f01e232488492e45b3 (diff)
downloadnextcloud-server-afad27fafd996f0e2e7117d9f431f9eb63736569.tar.gz
nextcloud-server-afad27fafd996f0e2e7117d9f431f9eb63736569.zip
Merge pull request #24075 from owncloud/no-html-on-cli
In case of fatal php errors and other unhandled exceptions no html er…
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/log/errorhandler.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/private/log/errorhandler.php b/lib/private/log/errorhandler.php
index 27cde4aa242..8899bcfcb03 100644
--- a/lib/private/log/errorhandler.php
+++ b/lib/private/log/errorhandler.php
@@ -44,6 +44,9 @@ class ErrorHandler {
if ($debug) {
set_error_handler(array($handler, 'onAll'), E_ALL);
+ if (\OC::$CLI) {
+ set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
+ }
} else {
set_error_handler(array($handler, 'onError'));
}