From 58b21e909d8ba628ddb8a19e732989821abb0283 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 10 Jun 2010 18:49:29 -0700
Subject: Change the pattern used to convert the file name to a title. Fixes
 ticket#1061

---
 modules/gallery/tests/Item_Helper_Test.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'modules/gallery/tests/Item_Helper_Test.php')

diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 4771b11a..00229973 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -41,6 +41,11 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
       ORM::factory("item")->viewable()->where("id", "=", $item->id)->count_all());
   }
 
+  public function convert_filename_to_title_test() {
+    $this->assert_equal("foo", item::convert_filename_to_title("foo.jpg"));
+    $this->assert_equal("foo.bar", item::convert_filename_to_title("foo.bar.jpg"));
+  }
+
   public function convert_filename_to_slug_test() {
     $this->assert_equal("foo", item::convert_filename_to_slug("{[foo]}"));
     $this->assert_equal("foo-bar", item::convert_filename_to_slug("{[foo!@#!$@#^$@($!(@bar]}"));
-- 
cgit v1.2.3


From 0d424a635d12eee59d2080fa7ffa32a248b0fd5c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 3 Jul 2010 14:25:33 -0700
Subject: When we delete an item, make sure that we scrub it from any other
 items that may have it in the album_cover_item_id column.  Fixes ticket
 #1172.

---
 modules/gallery/helpers/gallery_event.php  | 9 +++++++++
 modules/gallery/tests/Item_Helper_Test.php | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/tests/Item_Helper_Test.php')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 82f42d98..40ea50fa 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -98,6 +98,15 @@ class gallery_event_Core {
   static function item_deleted($item) {
     access::delete_item($item);
 
+    // Find any other albums that had the deleted item as the album cover and null it out.
+    // In some cases this may leave us with a missing album cover up in this item's parent
+    // hierarchy, but in most cases it'll work out fine.
+    foreach (ORM::factory("item")
+             ->where("album_cover_item_id", "=", $item->id)
+             ->find_all() as $parent) {
+      item::remove_album_cover($parent);
+    }
+
     $parent = $item->parent();
     if (!$parent->album_cover_item_id) {
       // Assume we deleted the album cover and pick a new one.  Choosing the first photo in the
diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 00229973..eb2458cb 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -111,15 +111,18 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_not_same($rand, $photo2->slug);
   }
 
-  public function delete_cover_photo_picks_new_album_cover() {
-    $album = test::random_album();
+  public function delete_cover_photo_picks_new_album_cover_test() {
+    $parent = test::random_album();
+    $album = test::random_album($parent);
     $photo1 = test::random_photo($album);
     // At this point, $photo1 is the album cover.  We verify this in
     // Item_Model_Test::first_photo_becomes_album_cover
     $photo2 = test::random_photo($album);
     $photo1->delete();
     $album->reload();
+    $parent->reload();
 
     $this->assert_same($photo2->id, $album->album_cover_item_id);
+    $this->assert_same($photo2->id, $parent->album_cover_item_id);
   }
 }
-- 
cgit v1.2.3