Issue 10050: Improve photo deletions

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index e5b2ef87b96e3654901cf12c6f2c0b5721a3fd52..4c49bdf43af5f7f35ac94a4e67f5b6ec1760acf5 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -364,15 +364,20 @@ class Photo
        public static function delete(array $conditions, array $options = [])
        {
                // get photo to delete data info
-               $photos = self::selectToArray(['backend-class', 'backend-ref'], $conditions);
+               $photos = DBA::select('photo', ['id', 'backend-class', 'backend-ref'], $conditions);
 
-               foreach($photos as $photo) {
+               while ($photo = DBA::fetch($photos)) {
                        $backend_class = DI::storageManager()->getByName($photo['backend-class'] ?? '');
                        if ($backend_class !== null) {
-                               $backend_class->delete($photo["backend-ref"] ?? '');
+                               if ($backend_class->delete($photo["backend-ref"] ?? '')) {
+                                       // Delete the photos after they had been deleted successfully
+                                       DBA::delete("photo", ['id' => $photo['id']]);
+                               }
                        }
                }
 
+               DBA::close($photos);
+
                return DBA::delete("photo", $conditions, $options);
        }