From 10aa2968957a3937b34c86f565c64324d676dba8 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Tue, 17 Jan 2012 20:00:12 +0100 Subject: [PATCH] fix: oc-33 --- apps/gallery/lib/scanner.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php index 4ce38a99531..df33369b93b 100644 --- a/apps/gallery/lib/scanner.php +++ b/apps/gallery/lib/scanner.php @@ -59,9 +59,10 @@ class OC_Gallery_Scanner { $albums['imagesCount'] = $current_album['imagesCount']; $albums['albumName'] = $current_album['name']; - $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']); + $result = OC_Gallery_Album::find(OC_User::getUser(), /*$current_album['name']*/ null, $path); + // don't duplicate galleries with same path (bug oc-33) if ($result->numRows() == 0 && count($current_album['images'])) { - OC_Gallery_Album::create(OC_User::getUser(), $current_album['name'], $path); + OC_Gallery_Album::create(OC_User::getUser(), $current_album['name'], $path); $result = OC_Gallery_Album::find(OC_User::getUser(), $current_album['name']); } $albumId = $result->fetchRow(); -- 2.39.5