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

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

Browse Source
This commit is contained in:
Jamie Cameron
2020-12-20 19:38:37 -08:00
parent ad5d1d4613 d4e8a35a3e
commit 60f77b65db
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
filemin/edit_file.cgi
View File

@@ -27,7 +27,7 @@ if ((lc(get_charset()) eq "utf-8" && ($encoding_name && lc($encoding_name) ne "u
}
eval {$data = Encode::encode('utf-8', Encode::decode($encoding_name, $data))};
}
my $file_binary = -B $file;
my $file_binary = -s $file >= 128 && -B $file;
&ui_print_header(undef, $text{'edit_file'}, "");
$head = "<link rel='stylesheet' type='text/css' href='unauthenticated/css/style.css' />";

2
ui-lib.pl
View File

@@ -2763,7 +2763,7 @@ if (defined(&theme_ui_read_file_contents_limit)) {
return &theme_ui_read_file_contents_limit(@_);
}
my ($opts) = @_;
my $binary = -B $opts->{'file'};
my $binary = -s $opts->{'file'} >= 128 && -B $opts->{'file'};
my $data = &read_file_contents_limit($opts->{'file'}, $opts->{'limit'}, $opts);
my $error = $data->{'error'};
if ($error) {