diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index f5ee23368318e10fdad59ea0489362a7ff916c0e..08ee0abaafe50f4c7f56b063672e736c58f8e902 100644 --- a/lib/private/legacy/template.php +++ b/lib/private/legacy/template.php @@ -325,7 +325,9 @@ class OC_Template extends \OC\Template\Base { /** * print error page using Exception details - * @param Exception | Throwable $exception + * @param Exception|Throwable $exception + * @param bool $fetchPage + * @return bool|string */ public static function printExceptionErrorPage($exception, $fetchPage = false) { try { diff --git a/lib/public/ILogger.php b/lib/public/ILogger.php index 2d1bf4b804d19a4f03d04fa6cd8289939bb1f41b..28cc3b1433f56549ad66dd877896b0f5215ca65f 100644 --- a/lib/public/ILogger.php +++ b/lib/public/ILogger.php @@ -136,7 +136,7 @@ interface ILogger { * ]); * </code> * - * @param \Exception | \Throwable $exception + * @param \Exception|\Throwable $exception * @param array $context * @return void * @since 8.2.0 diff --git a/public.php b/public.php index a9365d6db6393b3906ad231b9cabd3d088ebfcef..efa59267125f8a0a373028f6a4c350043f1a6ede 100644 --- a/public.php +++ b/public.php @@ -51,8 +51,8 @@ try { $pathInfo = trim($pathInfo, '/'); list($service) = explode('/', $pathInfo); } - $file = OCP\Config::getAppValue('core', 'public_' . strip_tags($service)); - if (is_null($file)) { + $file = \OC::$server->getConfig()->getAppValue('core', 'public_' . strip_tags($service)); + if ($file === null) { header('HTTP/1.0 404 Not Found'); exit; }