2 files changed, 7 insertions, 1 deletions
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 903dadad..931da382 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -806,7 +806,7 @@ class Item_Model_Core extends ORM_MPTT {
 
     // 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
index 876fc137..8ae8a5dd 100644
--- a/modules/gallery/tests/Item_Model_Test.php
+++ b/modules/gallery/tests/Item_Model_Test.php
@@ -520,4 +520,10 @@ class Item_Model_Test extends Gallery_Unit_Test_Case {
       $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();
+  }
 }