From d20cae82ad3de7db8f8732c93a52d3ccc90831fb Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 9 May 2023 05:32:52 +0000 Subject: [PATCH] Use old error message when storing fails --- src/Model/Photo.php | 2 +- src/Module/Media/Photo/Upload.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Model/Photo.php b/src/Model/Photo.php index e07b6b6af..fbe7ac49e 100644 --- a/src/Model/Photo.php +++ b/src/Model/Photo.php @@ -1194,7 +1194,7 @@ class Photo $smallest = self::storeWithPreview($image, $user['uid'], $resource_id, $filename, $filesize, $album, $desc, $allow_cid, $allow_gid, $deny_cid, $deny_gid); if ($smallest < 0) { - Logger::notice('Photo not stored', ['resource-id' => $resource_id]); + Logger::warning('Photo could not be stored', ['uid' => $user['uid'], 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]); Logger::notice('Photo not stored', ['resource-id' => $resource_id]); return []; } diff --git a/src/Module/Media/Photo/Upload.php b/src/Module/Media/Photo/Upload.php index d00093388..7d7482fcc 100644 --- a/src/Module/Media/Photo/Upload.php +++ b/src/Module/Media/Photo/Upload.php @@ -175,8 +175,8 @@ class Upload extends \Friendica\BaseModule $smallest = Photo::storeWithPreview($image, $owner['uid'], $resource_id, $filename, $filesize, $album, '', $allow_cid, '', '', ''); if ($smallest < 0) { - $this->return(401, $this->t('Image could not be uploaded')); - @unlink($src); + $this->logger->warning('Photo::store() failed'); + $this->return(401, $this->t('Image upload failed.')); } $this->logger->info('upload done');