added more vars to GalleryAlbum and GalleryFile. fixed some tests

This commit is contained in:
Doug Bell 2008-04-17 22:54:19 +00:00
parent 5b16fcca51
commit 4ebed16c69
10 changed files with 148 additions and 2 deletions

View file

@ -389,6 +389,17 @@ sub getTemplateVars {
$var->{ $key } = $galleryVar->{ $key };
}
# More things from Gallery, but with different names
for my $key ( qw{ title menuTitle url } ) {
$var->{ "gallery_" . $key } = $galleryVar->{ $key };
}
# Add some things from Album
my $albumVar = $self->getParent->getTemplateVars;
for my $key ( qw{ title menuTitle url thumbnailUrl } ) {
$var->{ "album_" . $key } = $albumVar->{ $key };
}
# Add the search form
$self->getGallery->appendTemplateVarsSearchForm( $var );

View file

@ -392,7 +392,7 @@ sub updateExifDataFromFile {
}
# Remove other, pointless keys
for my $key ( qw( directory ) ) {
for my $key ( qw( Directory ) ) {
delete $info->{ $key };
}