diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-08-04 11:54:05 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-08-04 11:54:05 +0200 |
| commit | c6a181d00bbced264b92b31a29e5736534d9e7be (patch) | |
| tree | 43d66b8e2177920218d17b2d3076938e06b98ebd /lib | |
| parent | fa0105d6786661168e819f44326f6bd2894fa963 (diff) | |
| download | nextcloud-server-c6a181d00bbced264b92b31a29e5736534d9e7be.tar.gz nextcloud-server-c6a181d00bbced264b92b31a29e5736534d9e7be.zip | |
[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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/template.php | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |