]> git.decadent.org.uk Git - maypole.git/commitdiff
Added patch for Maypole::View::TT to remove use of a warn method on the request class...
authorBen Hutchings <ben@decadent.org.uk>
Mon, 27 Aug 2007 14:37:15 +0000 (14:37 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 4 Nov 2008 03:32:55 +0000 (03:32 +0000)
debian/patches/105_dont-use-warn-method.diff [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/105_dont-use-warn-method.diff b/debian/patches/105_dont-use-warn-method.diff
new file mode 100644 (file)
index 0000000..366c488
--- /dev/null
@@ -0,0 +1,31 @@
+--- maypole.orig/lib/Maypole/View/TT.pm
++++ maypole/lib/Maypole/View/TT.pm
+@@ -43,11 +43,11 @@
+   } else {
+     if ($@) {
+       my $error = "fatal error in template '$template_file' : $@\nTT paths : " . join(', ',$self->paths($r)) . "\n";
+-      $r->warn($error);
++      warn $error;
+       $r->{error} = $error;
+     } else {
+       my $error = "TT error for template '$template_file'\n" . $self->{tt}->error . "\nTT paths : " . join(', ',$self->paths($r)) . "\n";
+-      $r->warn($error);
++      warn $error;
+       $r->{error} = $error;
+     }
+     return ERROR;
+@@ -62,12 +62,12 @@
+     # Need to be very careful here.
+     my $tt = Template->new;
+     unless (ref $r->{config}) {
+-      $r->warn("no config for this request");
++      warn "no config for this request";
+       $error .= '<br> There was a problem finding configuration for this request';
+       $r->{config} ||= {};
+     }
+-    $r->warn("report_error - reporting error to user : $error\n");
++    warn "report_error - reporting error to user : $error\n";
+     if ($tt->process(\$error_template,
+                    { err_type => $type, error => $error,
index 69c9bda7d077627d92d52c12b852220b42f3c2c6..0f93769674c8dbf6e65ec50c011f077c4e891cc1 100644 (file)
@@ -2,4 +2,5 @@
 102_fix-apache_mvc-test.diff
 103_fix-view_object-warning.diff
 104_add-cgi-error-status.diff
+105_dont-use-warn-method.diff
 201_no-file-mmagic-xs.diff