From 9c7bdf2863bf94abc21fc649fb9bf91f7558bbad Mon Sep 17 00:00:00 2001 From: JT Smith Date: Tue, 27 May 2003 00:37:32 +0000 Subject: [PATCH] fixed a few theme bugs --- lib/WebGUI/Operation/Theme.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Operation/Theme.pm b/lib/WebGUI/Operation/Theme.pm index 109651f3f..ea7518b51 100644 --- a/lib/WebGUI/Operation/Theme.pm +++ b/lib/WebGUI/Operation/Theme.pm @@ -52,7 +52,7 @@ sub _submenu { tie %menu, 'Tie::IxHash'; $menu{WebGUI::URL::page('op=editTheme&themeId=new')} = WebGUI::International::get(901); $menu{WebGUI::URL::page('op=importTheme')} = WebGUI::International::get(924); - unless (isIn($session{form}{op}, qw(editTheme deleteThemeConfirm viewTheme listThemes)) || $session{form}{themeId} ne "new") { + unless (isIn($session{form}{op}, qw(deleteThemeConfirm viewTheme listThemes)) || $session{form}{themeId} eq "new") { $menu{WebGUI::URL::page('op=editTheme&themeId='.$session{form}{themeId})} = WebGUI::International::get(919); $menu{WebGUI::URL::page('op=deleteTheme&themeId='.$session{form}{themeId})} = WebGUI::International::get(918); $menu{WebGUI::URL::page('op=exportTheme&themeId='.$session{form}{themeId})} = WebGUI::International::get(920); @@ -313,7 +313,7 @@ sub www_exportTheme { } $sth->finish; $propertyFile->saveFromHashref($theme); - my $packageName = WebGUI::URL::makeCompliant($theme->{name}).".theme"; + my $packageName = WebGUI::URL::makeCompliant($theme->{name}).".theme.tar.gz"; $propertyFile->getNode->tar($packageName); my $export = WebGUI::Attachment->new($packageName,"temp"); $session{header}{redirect} = WebGUI::Session::httpRedirect($export->getURL); @@ -347,7 +347,7 @@ sub www_importThemeValidate { $output .= '

'.WebGUI::International::get(927).'

'; my $a = WebGUI::Attachment->new("","temp"); my $filename = $a->save("themePackage"); - return $output.WebGUI::International::get(935) unless ($filename =~ /\.theme$/); + return $output.WebGUI::International::get(935) unless ($filename =~ /\.theme.tar.gz$/); my $subnode = time(); my $extracted = WebGUI::Node->new("temp",$subnode); $extracted->untar($filename);