From 5424d6a40d13f922a19e2b2b0e484a56f4dbe7f3 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Wed, 19 Jul 2017 15:48:58 +0200 Subject: [PATCH] Add proper PHPDoc Signed-off-by: Lukas Reschke --- lib/private/legacy/template.php | 4 +++- lib/public/ILogger.php | 2 +- public.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php index f5ee233683..08ee0abaaf 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 2d1bf4b804..28cc3b1433 100644 --- a/lib/public/ILogger.php +++ b/lib/public/ILogger.php @@ -136,7 +136,7 @@ interface ILogger { * ]); * * - * @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 a9365d6db6..efa5926712 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; }