From c6a181d00bbced264b92b31a29e5736534d9e7be Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 4 Aug 2015 11:54:05 +0200 Subject: [PHP 7] Change type hint to also accept Errors PHP 7 changed the exception types and thus our error handler needs to be able to catch this. Without this in some cases just a white page is shown instead of an error message. --- lib/private/template.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/private/template.php b/lib/private/template.php index ca689729f80..e7acc778de3 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -222,9 +222,9 @@ class OC_Template extends \OC\Template\Base { /** * print error page using Exception details - * @param Exception $exception + * @param Exception|Error $exception */ - public static function printExceptionErrorPage(Exception $exception) { + public static function printExceptionErrorPage($exception) { $request = \OC::$server->getRequest(); $content = new \OC_Template('', 'exception', 'error', false); $content->assign('errorClass', get_class($exception)); -- cgit v1.2.3