nextcloud
/
photos
mirror of https://github.com/nextcloud/photos
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1599 from simonspa/p/fix-upload 

Fix upload of pictures into album
This commit is contained in:
Louis 2023-01-23 18:28:32 +01:00 committed by GitHub
parent 167b532734 6aa4c504aa
commit 1330f0059e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Controller/PreviewController.php
View File

@ -101,7 +101,7 @@ class PreviewController extends Controller {
if (\count($nodes) === 0) {
$receivedAlbums = $this->albumMapper->getAlbumsForCollaboratorIdAndFileId($user->getUID(), AlbumMapper::TYPE_USER, $fileId);
$receivedAlbums = array_udiff($receivedAlbums, $checkedAlbums, fn ($a, $b) => strcmp($a->getId(), $b->getId()));
$receivedAlbums = array_udiff($receivedAlbums, $checkedAlbums, fn ($a, $b) => ($a->getId() - $b->getId()));
$nodes = $this->getFileIdForAlbums($fileId, $receivedAlbums);
$checkedAlbums = array_merge($checkedAlbums, $receivedAlbums);
}
@ -110,7 +110,7 @@ class PreviewController extends Controller {
$userGroups = $this->groupManager->getUserGroupIds($user);
foreach ($userGroups as $groupId) {
$albumsForGroup = $this->albumMapper->getAlbumsForCollaboratorIdAndFileId($groupId, AlbumMapper::TYPE_GROUP, $fileId);
$albumsForGroup = array_udiff($albumsForGroup, $checkedAlbums, fn ($a, $b) => strcmp($a->getId(), $b->getId()));
$albumsForGroup = array_udiff($albumsForGroup, $checkedAlbums, fn ($a, $b) => ($a->getId() - $b->getId()));
$nodes = $this->getFileIdForAlbums($fileId, $albumsForGroup);
$checkedAlbums = array_merge($checkedAlbums, $receivedAlbums);
if (\count($nodes) !== 0) {

4
lib/Sabre/Album/AlbumRoot.php
View File

@ -95,10 +95,10 @@ class AlbumRoot implements ICollection, ICopyTarget {
[$photosLocation, $userFolder] = $this->getPhotosLocationInfo();
try {
$photosFolder = $this->userFolder->get($photosLocation);
$photosFolder = $userFolder->get($photosLocation);
} catch (NotFoundException $e) {
// If the folder does not exists, create it
$photosFolder = $this->userFolder->newFolder($photosLocation);
$photosFolder = $userFolder->newFolder($photosLocation);
}
// If the node is not a folder, we throw