michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2023-01-18 13:38:33 -08:00
parent 40bf45ae42 a875b8e7eb
commit 35a259eabc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web-lib-funcs.pl
View File

@@ -1652,8 +1652,6 @@ by the message setup using that function.
sub error
{
$main::no_miniserv_userdb = 1;
&setvar('error-fatal-ignored', 1);
return if $main::ignore_errors;
&setvar('error-fatal', 1);
my $msg = join("", @_);
$msg =~ s/<[^>]*>//g;
@@ -5312,9 +5310,10 @@ if ($ENV{'HTTP_X_REQUESTED_WITH'} ne "XMLHttpRequest" &&
$url_to_filename = substr($url_to_filename, 0, 128);
# Write URL for the theme to read and open
$main::ignore_errors = 1;
&write_file(&tempname('.theme_' . $salt . '_' . $url_to_filename . '_' . get_product_name() . '_' . $key . '_' . $remote_user), \%var);
$main::ignore_errors = 0;
eval {
$main::error_must_die = 1;
&write_file(&tempname('.theme_' . $salt . '_' . $url_to_filename . '_' . get_product_name() . '_' . $key . '_' . $remote_user), \%var);
};
}
&redirect("/");
}