diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2025-02-01 11:19:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-01 11:19:36 +0100 |
| commit | 7bf9848334388df38cf29fe35a73a30125c96214 (patch) | |
| tree | a048e578e826dc286cf586b28e9f1ae5341e0298 /lib/private | |
| parent | 547dc41c7651915000741c411988c034b74acc7c (diff) | |
| parent | 7246b5d3c92bc45dc9494e5187776e3c295d4ca5 (diff) | |
| download | nextcloud-server-7bf9848334388df38cf29fe35a73a30125c96214.tar.gz nextcloud-server-7bf9848334388df38cf29fe35a73a30125c96214.zip | |
Merge pull request #50600 from nextcloud/backport/50549/stable29
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/legacy/OC_Files.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php index b8eb6fe1ed0..c14f7469a84 100644 --- a/lib/private/legacy/OC_Files.php +++ b/lib/private/legacy/OC_Files.php @@ -48,6 +48,7 @@ use OCP\Files\Events\BeforeDirectFileDownloadEvent; use OCP\Files\Events\BeforeZipCreatedEvent; use OCP\Files\IRootFolder; use OCP\Lock\ILockingProvider; +use Psr\Log\LoggerInterface; /** * Class for file server access @@ -237,12 +238,15 @@ class OC_Files { die(); } catch (\Exception $ex) { self::unlockAllTheFiles($dir, $files, $getType, $view, $filename); - OC::$server->getLogger()->logException($ex); - $l = \OC::$server->getL10N('lib'); - $hint = method_exists($ex, 'getHint') ? $ex->getHint() : ''; - if ($event && $event->getErrorMessage() !== null) { + $logger = \OCP\Server::get(LoggerInterface::class); + $logger->error($ex->getMessage(), ['exception' => $ex]); + $l = \OCP\Server::get(\OCP\L10N\IFactory::class)->get('lib'); + + $hint = ($ex instanceof \OCP\HintException) ? $ex->getHint() : ''; + if (isset($event) && $event->getErrorMessage() !== null) { $hint .= ' ' . $event->getErrorMessage(); } + \OC_Template::printErrorPage($l->t('Cannot download file'), $hint, 200); } } |