Allow albums to have two (or more) dots in the name. Fixes #1897.

ckdake · Jul 21, 2012 · 6d9d6a2 · 6d9d6a2
1 parent a98afdb
commit 6d9d6a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
@@ -806,7 +806,7 @@ public function valid_name(Validation $v, $field) {
 
     // Do not accept files with double extensions, they can cause problems on some
     // versions of Apache.
-    if (substr_count($this->name, ".") > 1) {
+    if (!$this->is_album() && substr_count($this->name, ".") > 1) {
       $v->add_error("name", "illegal_data_file_extension");
     }
 

diff --git a/modules/gallery/tests/Item_Model_Test.php b/modules/gallery/tests/Item_Model_Test.php
@@ -520,4 +520,10 @@ public function cant_rename_to_illegal_extension_test() {
       $this->assert_true(false, "Shouldn't get here");
     }
   }
+
+  public function albums_can_have_two_dots_in_name_test() {
+    $album = test::random_album_unsaved(item::root());
+    $album->name = $album->name . ".foo.bar";
+    $album->save();
+  }
 }