Bug 21206: (QA follow-up) Rebase problem and leftover mocked GetItem

[koha.git] / C4 / Output.pm

diff --git a/C4/Output.pm b/C4/Output.pm
index c605739..71f82e8 100644 (file)
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -50,7 +50,7 @@ BEGIN {
     );
     push @EXPORT, qw(
         &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
-        &output_and_exit_if_error
+        &output_and_exit_if_error &output_and_exit
     );
 
 }
@@ -62,7 +62,6 @@ C4::Output - Functions for managing output, is slowly being deprecated
 =head1 FUNCTIONS
 
 =over 2
-=cut
 
 =item pagination_bar
 
@@ -307,7 +306,7 @@ sub is_ajax {
     return ( $x_req and $x_req =~ /XMLHttpRequest/i ) ? 1 : 0;
 }
 
-=item
+=item output_and_exit_if_error
 
     output_and_exit_if_error( $query, $cookie, $template, $params );
 
@@ -338,23 +337,35 @@ sub output_and_exit_if_error {
         }
     }
 
-    if ( $error ) {
-        $template->param( blocking_error => $error );
-        output_html_with_http_headers ( $query, $cookie, $template->output );
-        exit;
-    }
+    output_and_exit( $query, $cookie, $template, $error ) if $error;
     return;
 }
 
+=item output_and_exit
+
+    output_and_exit( $query, $cookie, $template, $error );
+
+    $error is a blocking error like biblionumber not found or so.
+    We should output the error and exit.
+
+=cut
+
+sub output_and_exit {
+    my ( $query, $cookie, $template, $error ) = @_;
+    $template->param( blocking_error => $error );
+    output_html_with_http_headers ( $query, $cookie, $template->output );
+    exit;
+}
+
 sub parametrized_url {
     my $url = shift || ''; # ie page.pl?ln={LANG}
     my $vars = shift || {}; # ie { LANG => en }
     my $ret = $url;
     while ( my ($key,$val) = each %$vars) {
-        my $val_url = URI::Escape::uri_escape_utf8($val);
+        my $val_url = URI::Escape::uri_escape_utf8( $val // q{} );
         $ret =~ s/\{$key\}/$val_url/g;
     }
-    $ret =~ s/\{[^\{]*\}//g; # remove not defined vars
+    $ret =~ s/\{[^\{]*\}//g; # remove remaining vars
     return $ret;
 }