|
Lines 271-276
sub output_with_http_headers {
Link Here
|
| 271 |
}; |
271 |
}; |
| 272 |
$options->{expires} = 'now' if $extra_options->{force_no_caching}; |
272 |
$options->{expires} = 'now' if $extra_options->{force_no_caching}; |
| 273 |
|
273 |
|
|
|
274 |
my $redirect_url = $extra_options->{redirect_url}; |
| 275 |
|
| 274 |
$options->{cookie} = $cookie if $cookie; |
276 |
$options->{cookie} = $cookie if $cookie; |
| 275 |
if ($content_type eq 'html') { # guaranteed to be one of the content_type_map keys, else we'd have died |
277 |
if ($content_type eq 'html') { # guaranteed to be one of the content_type_map keys, else we'd have died |
| 276 |
$options->{'Content-Style-Type' } = 'text/css'; |
278 |
$options->{'Content-Style-Type' } = 'text/css'; |
|
Lines 281-287
sub output_with_http_headers {
Link Here
|
| 281 |
# We need to fix the encoding as it comes out of the database, or when we pass the variables to templates |
283 |
# We need to fix the encoding as it comes out of the database, or when we pass the variables to templates |
| 282 |
|
284 |
|
| 283 |
$data =~ s/\&\;amp\; /\&\; /g; |
285 |
$data =~ s/\&\;amp\; /\&\; /g; |
| 284 |
print $query->header($options), $data; |
286 |
|
|
|
287 |
if ( $redirect_url =~ /opac-search/ ) { |
| 288 |
print $query->redirect( |
| 289 |
-URL => $redirect_url, |
| 290 |
-COOKIE => $cookie, |
| 291 |
); |
| 292 |
} |
| 293 |
else { |
| 294 |
print $query->header($options), $data; |
| 295 |
} |
| 285 |
} |
296 |
} |
| 286 |
|
297 |
|
| 287 |
sub output_html_with_http_headers { |
298 |
sub output_html_with_http_headers { |
|
Lines 289-295
sub output_html_with_http_headers {
Link Here
|
| 289 |
output_with_http_headers( $query, $cookie, $data, 'html', $status, $extra_options ); |
300 |
output_with_http_headers( $query, $cookie, $data, 'html', $status, $extra_options ); |
| 290 |
} |
301 |
} |
| 291 |
|
302 |
|
| 292 |
|
|
|
| 293 |
sub output_ajax_with_http_headers { |
303 |
sub output_ajax_with_http_headers { |
| 294 |
my ( $query, $js ) = @_; |
304 |
my ( $query, $js ) = @_; |
| 295 |
print $query->header( |
305 |
print $query->header( |