From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 20 Aug 2007 21:32:48 +0000 (+0000)
Subject: Added patch to remove a subroutine definition which is currently replaced and results... 
X-Git-Tag: 2.11+2.111-1~11
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=commitdiff_plain;h=74f4bd70e03353b0df65decf6a9ef77aa2401b3e

Added patch to remove a subroutine definition which is currently replaced and results in a run-time warning.
---

diff --git a/debian/patches/103_fix-view_object-warning.diff b/debian/patches/103_fix-view_object-warning.diff
new file mode 100644
index 0000000..34d1a1d
--- /dev/null
+++ b/debian/patches/103_fix-view_object-warning.diff
@@ -0,0 +1,16 @@
+--- maypole.orig/lib/Maypole.pm
++++ maypole/lib/Maypole.pm
+@@ -495,13 +495,6 @@
+     return $self->NEXT::DISTINCT::get_template_root( $r, @_ );
+ }
+ 
+-sub view_object {
+-    my $self = shift;
+-    my $r    = shift;
+-    return $r->parent->view_object if $r->{parent};
+-    return $self->NEXT::DISTINCT::view_object( $r, @_ );
+-}
+-
+ # Instead of making plugin authors use the NEXT::DISTINCT hoopla to ensure other 
+ # plugins also get to call the hook, we can cycle through the application's 
+ # @ISA and call them all here. Doesn't work for setup() though, because it's 
diff --git a/debian/patches/series b/debian/patches/series
index 1b38d8c..834be6e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 101_fix-extension-mime-type.diff
 102_fix-apache_mvc-test.diff
+103_fix-view_object-warning.diff
 201_no-file-mmagic-xs.diff