[Koha-patches] [PATCH] Bug 4514 (Error handling) -- For master only.

Marcel de Rooy M.de.Rooy at rijksmuseum.nl
Mon Jun 7 13:46:21 CEST 2010


Corrected the routine name to output_html_with_http_headers. Similar patch was already submitted for 3.0.x. This applies to master only.
---
 errors/400.pl                                      |    2 +-
 errors/401.pl                                      |    2 +-
 errors/402.pl                                      |    2 +-
 errors/403.pl                                      |    2 +-
 errors/404.pl                                      |    2 +-
 errors/500.pl                                      |    2 +-
 opac/errors/400.pl                                 |    2 +-
 opac/errors/401.pl                                 |    2 +-
 opac/errors/402.pl                                 |    2 +-
 opac/errors/403.pl                                 |    2 +-
 opac/errors/404.pl                                 |    2 +-
 opac/errors/500.pl                                 |    2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/errors/400.pl b/errors/400.pl
index b04b7fd..58363bf 100755
--- a/errors/400.pl
+++ b/errors/400.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';
diff --git a/errors/401.pl b/errors/401.pl
index 3ea459a..665f1d8 100755
--- a/errors/401.pl
+++ b/errors/401.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';
diff --git a/errors/402.pl b/errors/402.pl
index 4bfe7ce..b94d0bd 100755
--- a/errors/402.pl
+++ b/errors/402.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';
diff --git a/errors/403.pl b/errors/403.pl
index 4058ce9..b08ae39 100755
--- a/errors/403.pl
+++ b/errors/403.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';
diff --git a/errors/404.pl b/errors/404.pl
index 418723f..806ad2c 100755
--- a/errors/404.pl
+++ b/errors/404.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
diff --git a/errors/500.pl b/errors/500.pl
index 6f570a2..56270e1 100755
--- a/errors/500.pl
+++ b/errors/500.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
diff --git a/opac/errors/400.pl b/opac/errors/400.pl
index a0d9413..8c9bbb0 100755
--- a/opac/errors/400.pl
+++ b/opac/errors/400.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '400 Bad Request';
diff --git a/opac/errors/401.pl b/opac/errors/401.pl
index 216b643..08b69dc 100755
--- a/opac/errors/401.pl
+++ b/opac/errors/401.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '401 Unauthorized';
diff --git a/opac/errors/402.pl b/opac/errors/402.pl
index b84ccca..507424b 100755
--- a/opac/errors/402.pl
+++ b/opac/errors/402.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '402 Payment Required';
diff --git a/opac/errors/403.pl b/opac/errors/403.pl
index ba21cd6..52b21c5 100755
--- a/opac/errors/403.pl
+++ b/opac/errors/403.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '403 Forbidden';
diff --git a/opac/errors/404.pl b/opac/errors/404.pl
index 0c5408c..c299f02 100755
--- a/opac/errors/404.pl
+++ b/opac/errors/404.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_html_with_http_headers $query, $cookie, $template->output, '404 Not Found';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
diff --git a/opac/errors/500.pl b/opac/errors/500.pl
index fb0350e..2b082db 100755
--- a/opac/errors/500.pl
+++ b/opac/errors/500.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
+output_html_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
-- 
1.6.0.6



More information about the Koha-patches mailing list