From 17a6c0fc92f16370dc86569dbb791bd3f3063d35 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 24 Oct 2023 10:49:44 +0100 Subject: [PATCH] Bug 25672: Fix double output_html_with_http_headers We weren't exiting after calling output_html_with_http_headers and so we were ending up with a double template render (and also a subsequent confusion in the cookie consent code). Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Kyle M Hall --- plugins/plugins-upload.pl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl index dff5a7536a..02fd2548c7 100755 --- a/plugins/plugins-upload.pl +++ b/plugins/plugins-upload.pl @@ -35,24 +35,27 @@ my $plugins_enabled = C4::Context->config("enable_plugins"); my $plugins_restricted = C4::Context->config("plugins_restricted"); my $input = CGI->new; +my $uploadlocation = $input->param('uploadlocation'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => $plugins_enabled ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt", + template_name => ( !$plugins_enabled || $plugins_restricted && !$uploadlocation ) + ? 'plugins/plugins-disabled.tt' + : 'plugins/plugins-upload.tt', query => $input, type => "intranet", flagsrequired => { plugins => 'manage' }, } ); -my $uploadlocation = $input->param('uploadlocation'); - -# Early exists if uploads are not enabled direct upload attempted when uploads are restricted +# Early exist if uploads are not enabled direct upload attempted when uploads are restricted if (!$plugins_enabled) { output_html_with_http_headers $input, $cookie, $template->output; + exit; } elsif ( $plugins_restricted && !$uploadlocation ) { $template->param( plugins_restricted => $plugins_restricted ); output_html_with_http_headers $input, $cookie, $template->output; + exit; } my $uploadfilename = $input->param('uploadfile'); @@ -132,3 +135,5 @@ if ( ( $uploadfile || $uploadlocation ) && !%errors && !$template->param('ERRORS } else { output_html_with_http_headers $input, $cookie, $template->output; } + +exit; -- 2.42.0