summaryrefslogtreecommitdiff
path: root/modules/gallery/models
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-07-30 05:48:12 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-07-30 05:48:12 -0700
commitf50151cf1840b1d9d528b76ac9fc4ed20a351759 (patch)
tree51481b25663a61dd98c6e47e55ff0ee824bf413b /modules/gallery/models
parent21e3e86885b9f1b430a98553810327ac573412ca (diff)
parent7b8ed1079624eefae8d83fac89caa0eaa3fc9ef4 (diff)
Merge branch 'master' into dialog
Diffstat (limited to 'modules/gallery/models')
-rw-r--r--modules/gallery/models/item.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index eb200fa5..c00b7972 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -760,9 +760,9 @@ class Item_Model extends ORM_MPTT {
// Conditional rules
if ($this->id == 1) {
- // Root album can't have a name or slug so replace the rules
- $this->rules["name"] = array("rules" => array("length[0]"));
- $this->rules["slug"] = array("rules" => array("length[0]"));
+ // We don't care about the name and slug for the root album.
+ $this->rules["name"] = array();
+ $this->rules["slug"] = array();
}
// Movies and photos must have data files