View | Details | Raw Unified | Return to bug 17153
Collapse All | Expand All

(-)a/C4/Output.pm (-2 / +10 lines)
Lines 43-55 BEGIN { Link Here
43
    %EXPORT_TAGS = ( all =>[qw(setlanguagecookie pagination_bar parametrized_url
43
    %EXPORT_TAGS = ( all =>[qw(setlanguagecookie pagination_bar parametrized_url
44
                                &output_with_http_headers &output_ajax_with_http_headers &output_html_with_http_headers)],
44
                                &output_with_http_headers &output_ajax_with_http_headers &output_html_with_http_headers)],
45
                    ajax =>[qw(&output_with_http_headers &output_ajax_with_http_headers is_ajax)],
45
                    ajax =>[qw(&output_with_http_headers &output_ajax_with_http_headers is_ajax)],
46
                    html =>[qw(&output_with_http_headers &output_html_with_http_headers)]
46
                    html =>[qw(&output_with_http_headers &output_html_with_http_headers &output_with_redirect)]
47
                );
47
                );
48
    push @EXPORT, qw(
48
    push @EXPORT, qw(
49
        setlanguagecookie getlanguagecookie pagination_bar parametrized_url
49
        setlanguagecookie getlanguagecookie pagination_bar parametrized_url
50
    );
50
    );
51
    push @EXPORT, qw(
51
    push @EXPORT, qw(
52
        &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
52
        &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers &output_with_redirect
53
    );
53
    );
54
54
55
}
55
}
Lines 284-289 sub output_with_http_headers { Link Here
284
    print $query->header($options), $data;
284
    print $query->header($options), $data;
285
}
285
}
286
286
287
sub output_with_redirect {
288
	my ( $query, $url, $cookie ) = @_;
289
	print $query->redirect(
290
		-URL    => $url,
291
		-COOKIE => $cookie,
292
	);
293
}
294
287
sub output_html_with_http_headers {
295
sub output_html_with_http_headers {
288
    my ( $query, $cookie, $data, $status, $extra_options ) = @_;
296
    my ( $query, $cookie, $data, $status, $extra_options ) = @_;
289
    output_with_http_headers( $query, $cookie, $data, 'html', $status, $extra_options );
297
    output_with_http_headers( $query, $cookie, $data, 'html', $status, $extra_options );
(-)a/opac/opac-user.pl (-2 / +6 lines)
Lines 356-359 $template->param( Link Here
356
    failed_holds             => scalar $query->param('failed_holds'),
356
    failed_holds             => scalar $query->param('failed_holds'),
357
);
357
);
358
358
359
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
359
if ( !$ENV{HTTP_REFERER} =~ /opac-search.pl/ || !$ENV{HTTP_REFERER} =~ /eds-search.pl/ ) {
360
    output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
361
}
362
else {
363
    output_with_redirect( $query, $ENV{HTTP_REFERER}, $cookie );
364
}
360
- 

Return to bug 17153