From 9504f71efcadc7ed27f6f09e5d663e8025bf3b86 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 15 Jun 2010 14:18:23 -0700
Subject: Fix for ticket #1118. Create a item::save_with_retries helper method,
 which encapsulates saving an item and handling name and slug conflicts. Call
 this instead of doing a save directly.

---
 modules/gallery/controllers/simple_uploader.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/controllers/simple_uploader.php')

diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index c7e5031b..8ac1fc8b 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -65,12 +65,16 @@ class Simple_Uploader_Controller extends Controller {
         if (array_key_exists("extension", $path_info) &&
             in_array(strtolower($path_info["extension"]), array("flv", "mp4"))) {
           $item->type = "movie";
-          $item->save();
+        } else {
+          $item->type = "photo";
+        }
+
+        item::save_with_retries($item);
+
+        if ($item->type == "movie") {
           log::success("content", t("Added a movie"),
                        html::anchor("movies/$item->id", t("view movie")));
         } else {
-          $item->type = "photo";
-          $item->save();
           log::success("content", t("Added a photo"),
                        html::anchor("photos/$item->id", t("view photo")));
         }
-- 
cgit v1.2.3