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.

1 files changed, 3 insertions, 5 deletions

diff --git a/modules/gallery/helpers/item_rest.php b/modules/gallery/helpers/item_rest.php
index 692d0895..74fab2e7 100644
--- a/modules/gallery/helpers/item_rest.php
+++ b/modules/gallery/helpers/item_rest.php
@@ -112,8 +112,6 @@ class item_rest_Core {
           }
           break;
 
-        case "parent":
-          break;
         default:
           if (property_exists($entity, $key)) {
             $item->$key = $entity->$key;
@@ -126,7 +124,7 @@ class item_rest_Core {
         $parent = rest::resolve($entity->parent);
         item::move($item, $parent);
       } else {
-        $item->save();
+        $item::save_with_retries($item);
       }
     }
 
@@ -157,7 +155,7 @@ class item_rest_Core {
       $item->title = isset($entity->title) ? $entity->title : $entity->name;
       $item->description = isset($entity->description) ? $entity->description : null;
       $item->slug = isset($entity->slug) ? $entity->slug : null;
-      $item->save();
+      $item::save_with_retries($item);
       break;
 
     case "photo":
@@ -172,7 +170,7 @@ class item_rest_Core {
       $item->title = isset($entity->title) ? $entity->title : $entity->name;
       $item->description = isset($entity->description) ? $entity->description : null;
       $item->slug = isset($entity->slug) ? $entity->slug : null;
-      $item->save();
+      $item::save_with_retries($item);
       break;
 
     default: