diff options
| author | Louis <louis@chmn.me> | 2024-06-04 12:53:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-04 12:53:23 +0200 |
| commit | 69f9e277f1443796d49d181b5fe2adb5a5eb3e97 (patch) | |
| tree | 8aff20476142d86cdd6e092ac2bc3baa66ab0637 | |
| parent | c4acc4c617fa25ee32e455e75a5e41c5eb72bb48 (diff) | |
| parent | c0819a1b85db8316faed232be43d6414152cd3d0 (diff) | |
Merge pull request #2495 from nextcloud/backport/2494/stable29v29.0.3rc2v29.0.3rc1v29.0.2
[stable29] fix: add typecast for mimetype
| -rw-r--r-- | lib/Album/AlbumMapper.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/Album/AlbumMapper.php b/lib/Album/AlbumMapper.php index acc8f4b0..30d229e4 100644 --- a/lib/Album/AlbumMapper.php +++ b/lib/Album/AlbumMapper.php @@ -110,7 +110,7 @@ class AlbumMapper { return new AlbumInfo((int)$row['album_id'], $userId, $row['name'], $row['location'], (int)$row['created'], (int)$row['last_added_photo']); }, $rows); } - + /** * @param string $albumName * @param string $userName @@ -220,10 +220,8 @@ class AlbumMapper { $files = []; foreach ($rows as $row) { - $albumId = (int)$row['album_id']; if ($row['fileid']) { - $mimeId = $row['mimetype']; - $mimeType = $this->mimeTypeLoader->getMimetypeById($mimeId); + $mimeType = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype']); $files[] = new AlbumFile((int)$row['fileid'], $row['file_name'], $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag'], (int)$row['added'], $row['owner']); } } @@ -248,8 +246,7 @@ class AlbumMapper { ->andWhere($query->expr()->eq('file_id', $query->createNamedParameter($fileId, IQueryBuilder::PARAM_INT))); $row = $query->executeQuery()->fetchAll()[0]; - $mimeId = $row['mimetype']; - $mimeType = $this->mimeTypeLoader->getMimetypeById($mimeId); + $mimeType = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype']); return new AlbumFile((int)$row['fileid'], $row['file_name'], $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag'], (int)$row['added'], $row['owner']); } @@ -548,8 +545,7 @@ class AlbumMapper { foreach ($rows as $row) { $albumId = (int)$row['album_id']; if ($row['fileid']) { - $mimeId = $row['mimetype']; - $mimeType = $this->mimeTypeLoader->getMimetypeById($mimeId); + $mimeType = $this->mimeTypeLoader->getMimetypeById((int)$row['mimetype']); $filesByAlbum[$albumId][] = new AlbumFile((int)$row['fileid'], $row['file_name'], $mimeType, (int)$row['size'], (int)$row['mtime'], $row['etag'], (int)$row['added'], $row['owner']); } |