summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-06-11 16:37:45 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-06-11 16:37:45 -0700
commitcb01f4017d70a7d73273052b424e8b78b794bc1c (patch)
tree7dc322d4820a70b2645bb91f6a13abd2c39bd247 /modules
parent41c18929cd23cf142df75ec9f9666102c593fcae (diff)
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
duplicates were made unique, so this patch removes the validation as unnecessary.
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/models/item.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 009457c1..a4f264bb 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -767,13 +767,6 @@ 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");
}
}