3 files changed, 53 insertions, 18 deletions

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 5f62f798..732a1789 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -168,15 +168,27 @@ class Albums_Controller extends Items_Controller {
 
     $form = album::get_edit_form($album);
     if ($valid = $form->validate()) {
-      // Make sure that there's not a conflict
       if ($album->id != 1 &&
-          Database::instance()
+          $form->edit_item->dirname->value != $album->name ||
+          $form->edit_item->slug->value != $album->slug) {
+        // Make sure that there's not a conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
           ->from("items")
           ->where("parent_id", $album->parent_id)
           ->where("id <>", $album->id)
+          ->open_paren()
           ->where("name", $form->edit_item->dirname->value)
-          ->count_records()) {
-        $form->edit_item->dirname->add_error("conflict", 1);
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->dirname->value) {
+          $form->edit_item->dirname->add_error("name_conflict", 1);
+        }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
         $valid = false;
       }
     }
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index c40cde9e..2ba6bb5b 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -72,14 +72,26 @@ class Movies_Controller extends Items_Controller {
 
     $form = photo::get_edit_form($photo);
     if ($valid = $form->validate()) {
-      // Make sure that there's not a conflict
-      if (Database::instance()
+      if ($form->edit_item->filename->value != $photo->name ||
+          $form->edit_item->slug->value != $photo->slug) {
+        // Make sure that there's not a name or slug conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
           ->from("items")
           ->where("parent_id", $photo->parent_id)
           ->where("id <>", $photo->id)
+          ->open_paren()
           ->where("name", $form->edit_item->filename->value)
-          ->count_records()) {
-        $form->edit_item->filename->add_error("conflict", 1);
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->filename->value) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
+        }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
         $valid = false;
       }
     }
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index dd6d3ab5..159501c0 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -62,18 +62,29 @@ class Photos_Controller extends Items_Controller {
     access::required("edit", $photo);
 
     $form = photo::get_edit_form($photo);
+    $valid = $form->validate();
     if ($valid = $form->validate()) {
-      if ($form->edit_item->filename->value != $photo->name) {
-        // Make sure that there's not a conflict
-        if (Database::instance()
-            ->from("items")
-            ->where("parent_id", $photo->parent_id)
-            ->where("id <>", $photo->id)
-            ->where("name", $form->edit_item->filename->value)
-            ->count_records()) {
-          $form->edit_item->filename->add_error("conflict", 1);
-          $valid = false;
+      if ($form->edit_item->filename->value != $photo->name ||
+          $form->edit_item->slug->value != $photo->slug) {
+        // Make sure that there's not a name or slug conflict
+        $row = Database::instance()
+          ->select(array("name", "slug"))
+          ->from("items")
+          ->where("parent_id", $photo->parent_id)
+          ->where("id <>", $photo->id)
+          ->open_paren()
+          ->where("name", $form->edit_item->filename->value)
+          ->orwhere("slug", $form->edit_item->slug->value)
+          ->close_paren()
+          ->get()
+          ->current();
+        if ($row->name == $form->edit_item->filename->value) {
+          $form->edit_item->filename->add_error("name_conflict", 1);
         }
+        if ($row->slug == $form->edit_item->slug->value) {
+          $form->edit_item->slug->add_error("slug_conflict", 1);
+        }
+        $valid = false;
       }
     }