[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.
This commit is contained in:
Lukas Reschke 2015-08-04 11:54:05 +02:00
parent fa0105d678
commit c6a181d00b
1 changed files with 2 additions and 2 deletions

View File

@ -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));