Updated patches for 2.13.

[maypole.git] / debian / patches / 105_dont-use-warn-method.diff

diff --git a/debian/patches/105_dont-use-warn-method.diff b/debian/patches/105_dont-use-warn-method.diff
deleted file mode 100644 (file)
index 366c488..0000000
--- a/debian/patches/105_dont-use-warn-method.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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,