Don't call asset methods on undef in the GalleryAlbum. Fixes bug #11681.

plainblack · Jun 29, 2010 · c350cc2 · c350cc2
1 parent 20fed80
commit c350cc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -17,7 +17,7 @@
  - fixed #11678: Story Archive leaks version tags
  - fixed #11671: Approving version tags takes up 1 to hour to take affect.
  - fixed #11663: More detail section of image gallery
-
+ - fixed #11681: Gallery album chokes on photo w/ missing properties
 
 7.8.21
  - fixed #11597: manageTrash and newlines

diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
@@ -189,8 +189,9 @@ sub appendTemplateVarsFileLoop {
     my $assetIds    = shift;
     my $session     = $self->session;
 
-    for my $assetId (@$assetIds) {
+    ASSET: for my $assetId (@$assetIds) {
         my $asset = WebGUI::Asset->newByDynamicClass($session, $assetId);
+        next ASSET unless $asset;
         # Set the parent
         $asset->{_parent} = $self;
         push @{$var->{file_loop}}, $asset->getTemplateVars;