From 0d123fa590c0d6c0d8e0d2b5f440c8df4586e3a5 Mon Sep 17 00:00:00 2001
From: Ilia Rostovtsev <ilia@rostovtsev.io>
Date: Mon, 22 Feb 2021 19:45:23 +0300
Subject: [PATCH] Fix to prevent encoding detection if forbidden

---
 filemin/edit_file.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/filemin/edit_file.cgi b/filemin/edit_file.cgi
index 5e95872ae..9999dd3cc 100755
--- a/filemin/edit_file.cgi
+++ b/filemin/edit_file.cgi
@@ -25,7 +25,9 @@ if ((lc(get_charset()) eq "utf-8" && ($encoding_name && lc($encoding_name) ne "u
     if ($forced) {
         $encoding_name = "$1";
     }
-    eval {$data = Encode::encode('utf-8', Encode::decode($encoding_name, $data))};
+    if ($userconfig{'config_portable_module_filemanager_editor_detect_encoding'} ne 'false') {
+        eval {$data = Encode::encode('utf-8', Encode::decode($encoding_name, $data))};
+    }
 }
 my $file_binary = -s $file >= 128 && -B $file;
 &ui_print_header(undef, $text{'edit_file'}, "");