diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-07-19 15:48:58 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2017-08-01 08:20:15 +0200 |
| commit | 5424d6a40d13f922a19e2b2b0e484a56f4dbe7f3 (patch) | |
| tree | dceac8d538c25e63d838a1f10f5eaa257fb3bb39 | |
| parent | b4d4db0e39d3e09fe0cf53241c72d5d6fc180101 (diff) | |
| download | nextcloud-server-5424d6a40d13f922a19e2b2b0e484a56f4dbe7f3.tar.gz nextcloud-server-5424d6a40d13f922a19e2b2b0e484a56f4dbe7f3.zip | |
Add proper PHPDoc
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| -rw-r--r-- | lib/private/legacy/template.php | 4 | ||||
| -rw-r--r-- | lib/public/ILogger.php | 2 | ||||
| -rw-r--r-- | 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 f5ee2336831..08ee0abaafe 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 2d1bf4b804d..28cc3b1433f 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 a9365d6db63..efa59267125 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; } |