From: TehPeGaSuS <25697531+TehPeGaSuS@users.noreply.github.com> Date: Fri, 16 Oct 2026 10:42:58 +0000 (+0200) Subject: Keep the size error when the extension is also forbidden X-Git-Tag: 4.8.0~11^2~6 X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/commitdiff_plain/0c273fa9debe16278ffd6e06875435c6a3e882cb?ds=sidebyside Keep the size error when the extension is also forbidden --- diff --git a/lib/functions.js.php b/lib/functions.js.php index 9307eda..efa82e5 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -360,7 +360,12 @@ function control_selected_file_extension(disallowed_extensions, error_str) f_ext = f_name.includes('.') ? f_name.split('.').pop().toLowerCase() : ''; if (disallowed_extensions.includes(f_ext)) { - pop_failure(error_str); + // control_selected_file_size runs first: keep its error, if any, and add ours + var error_pop = document.getElementById('error_pop'); + if (error_pop.style.display === 'none') + pop_failure(error_str); + else + error_pop.innerHTML += '
' + error_str; // keep the button visible but disabled so the user sees it is forbidden document.getElementById('send').style.display = 'block'; document.getElementById('send').disabled = true;