merging 5.4.4 changes
This commit is contained in:
parent
2b6d4a36fc
commit
6272369816
12 changed files with 1842 additions and 18 deletions
|
|
@ -353,6 +353,7 @@ sub www_importThemeValidate {
|
|||
$extracted->untar($filename);
|
||||
my $propertiesFile = WebGUI::Attachment->new("_theme.properties","temp",$subnode);
|
||||
my $theme = $propertiesFile->getHashref;
|
||||
my @themes = WebGUI::SQL->buildArray("select name from theme");
|
||||
my $f = WebGUI::HTMLForm->new;
|
||||
$f->hidden(
|
||||
-name=>"op",
|
||||
|
|
@ -384,7 +385,7 @@ sub www_importThemeValidate {
|
|||
);
|
||||
if ($theme->{webguiVersion} > $WebGUI::VERSION) {
|
||||
$output .= WebGUI::International::get(926);
|
||||
} elsif (0) {
|
||||
} elsif (isIn($theme->{name},@themes)) {
|
||||
$output .= WebGUI::International::get(925);
|
||||
} else {
|
||||
$output .= WebGUI::International::get(928);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue