From 5ecc10b7567910e4cfee40aa2feea20090107f04 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Sun, 15 Jan 2012 11:51:01 +0100 Subject: [PATCH] recursive gallery removing on parent dir remove --- apps/gallery/lib/album.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php index 6adff19607..72653c8de1 100644 --- a/apps/gallery/lib/album.php +++ b/apps/gallery/lib/album.php @@ -48,6 +48,14 @@ class OC_Gallery_Album { $album = $album->fetchRow(); self::remove($owner, $album['album_name']); OC_Gallery_Photo::removeByAlbumId($album['album_id']); + // find and remove any gallery which might be stored lower in dir hierarchy + $path = $path.'/%'; + $stmt = OC_DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE album_path LIKE ? AND uid_owner = ?'); + $result = $stmt->execute(array($path, $owner)); + while (($album = $result->fetchRow())) { + OC_Gallery_Photo::removeByAlbumId($album['album_id']); + self::remove($owner, $album['album_name']); + } } public static function find($owner, $name=null, $path=null){