Revert "Fix for ticket #1118. The item validation was flagging duplicate slugs as errors. There was already code in the item save to insure that any"

This introduces a bug where you can create two items with the same slug.

This reverts commit cb01f4017d70a7d73273052b424e8b78b794bc1c.

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index a4f264bb..009457c1 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -767,6 +767,13 @@ class Item_Model extends ORM_MPTT {
   public function valid_slug(Validation $v, $field) {
     if (preg_match("/[^A-Za-z0-9-_]/", $this->slug)) {
       $v->add_error("slug", "not_url_safe");
+    } else if (db::build()
+        ->from("items")
+        ->where("parent_id", "=", $this->parent_id)
+        ->where("id", "<>", $this->id)
+        ->where("slug", "=", $this->slug)
+        ->count_records()) {
+      $v->add_error("slug", "conflict");
     }
   }