Skip to content

Commit 56d9a0a

Browse files
committed
Fix to properly disable website virtualmin/virtualmin-gpl#631
1 parent 0a62cb6 commit 56d9a0a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

virtual_feature.pl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -823,12 +823,8 @@ sub feature_disable
823823
# Disable is done via default website page
824824
my $def_tpl = &read_file_contents("$virtual_server::default_content_dir/index.html");
825825
my %hashtmp = %$d;
826-
$hashtmp{'TMPLTTITLE'} = $virtual_server::text{'deftmplt_website_disabled'};
827-
$hashtmp{'TMPLTSLOGAN'} = $virtual_server::text{'deftmplt_disable_slog'};
828-
if ($d->{'disabled_why'}) {
829-
$hashtmp{'TMPLTCONTENT'} = $d->{'disabled_why'};
830-
}
831-
%hashtmp = &virtual_server::populate_default_index_page(%hashtmp);
826+
%hashtmp = &virtual_server::populate_default_index_page($d, %hashtmp);
827+
$def_tpl = &virtual_server::replace_default_index_page($d, $def_tpl);
832828
$def_tpl = &virtual_server::substitute_virtualmin_template($def_tpl, \%hashtmp);
833829
my $msg = $tmpl->{'disabled_web'} eq 'none' ?
834830
$def_tpl :

0 commit comments

Comments
 (0)