From 7d5e5eb581ad3c3772f63928c8bb957b4066fb7e Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 1 Jan 2009 16:14:36 +0000
Subject: [PATCH] Forward port Album cache delete/DESTROY issue with
 non-existant keys in the cache.

---
 docs/changelog/7.x.x.txt                 | 1 +
 lib/WebGUI/Asset/Wobject/GalleryAlbum.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 4f3f4ac92..a386d1a62 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -22,6 +22,7 @@
  - fixed #9348: Required Upgrade Step Not Documented - 7.6.0
  - fixed #8993: Gallery Image Details Overlap Image
  - fixed #9380: CoolMenus template - invalid markup affecting page layouts
+ - fixed #9387: Asset Manager breaks navigating into a Gallery Album
 
 7.6.7
  - fixed #9263: Thingy possibleValues processing, and List type autodetection.
diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
index ac991cb50..ec417a85c 100644
--- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
+++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -346,7 +346,7 @@ sub DESTROY {
     my $self        = shift;
     for my $key ( qw/ _nextAlbum _prevAlbum / ) {
         my $asset       = delete $self->{ $key };
-        $asset->DESTROY;
+        $asset->DESTROY if $asset;
     }
 }