diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-08-04 15:14:56 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-04 15:14:56 +0200 |
| commit | 151bad07df6acd9763c587bf9b20f1d329fceed1 (patch) | |
| tree | 1ac10e6a384052f694dd08c81ca1945e259e4e68 | |
| parent | d0d6782615d27de42aed2159bdd645915163c50b (diff) | |
| parent | c6a181d00bbced264b92b31a29e5736534d9e7be (diff) | |
| download | nextcloud-server-151bad07df6acd9763c587bf9b20f1d329fceed1.tar.gz nextcloud-server-151bad07df6acd9763c587bf9b20f1d329fceed1.zip | |
Merge pull request #18050 from owncloud/php7-catch-type-error
[PHP 7] Change type hint to also accept Errors
| -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)); |