From 49f969133e26b35386c8603a5cec6d0f5082c21a Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 27 Jun 2012 02:44:47 +1200 Subject: [PATCH 1/1] Bug 6679 - [SIGNED-OFF] fix 3 perlcritic violations in C4/Output.pm "return" statement with explicit "undef" at line 128, column 74. See page 199 of PBP. (Severity: 5) Subroutine prototypes used at line 270, column 1. See page 194 of PBP. (Severity: 5) Subroutine prototypes used at line 308, column 1. See page 194 of PBP. (Severity: 5) Signed-off-by: Jonathan Druart --- C4/Output.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/Output.pm b/C4/Output.pm index 21002c0..3e78116 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -125,7 +125,7 @@ This function returns HTML, without any language dependency. =cut sub pagination_bar { - my $base_url = (@_ ? shift : $ENV{SCRIPT_NAME} . $ENV{QUERY_STRING}) or return undef; + my $base_url = (@_ ? shift : $ENV{SCRIPT_NAME} . $ENV{QUERY_STRING}) or return; my $nb_pages = (@_) ? shift : 1; my $current_page = (@_) ? shift : undef; # delay default until later my $startfrom_name = (@_) ? shift : 'page'; @@ -267,7 +267,7 @@ $status is an HTTP status message, like '403 Authentication Required'. It defaul =cut -sub output_with_http_headers($$$$;$) { +sub output_with_http_headers { my ( $query, $cookie, $data, $content_type, $status ) = @_; $status ||= '200 OK'; @@ -305,7 +305,7 @@ sub output_with_http_headers($$$$;$) { print $query->header($options), $data; } -sub output_html_with_http_headers ($$$;$) { +sub output_html_with_http_headers { my ( $query, $cookie, $data, $status ) = @_; output_with_http_headers( $query, $cookie, $data, 'html', $status ); } -- 1.7.7.3