X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FTT.pm;h=6a3bfe6297471bf8a509f5e3d0b2a84a02d741a8;hb=e767951f92d57740dc76425868cce32f6bcf1296;hp=e4867fc73450d2964b9eb3cee7d73e974c2de804;hpb=5e09c784983b4a041e81d15e06456e0c16da5bf3;p=maypole.git diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm index e4867fc..6a3bfe6 100644 --- a/lib/Maypole/View/TT.pm +++ b/lib/Maypole/View/TT.pm @@ -1,5 +1,4 @@ package Maypole::View::TT; -use Class::C3; use base 'Maypole::View::Base'; use Maypole::Constants; use Template; @@ -8,7 +7,7 @@ use File::Spec::Functions qw(catdir tmpdir); our $error_template; { local $/; $error_template = ; } -our $VERSION = '2.11'; +our $VERSION = '2.12'; use strict; @@ -16,6 +15,9 @@ sub template { my ( $self, $r ) = @_; unless ($self->{tt}) { my $view_options = $r->config->view_options || {}; + if ($r->debug) { + $view_options->{DEBUG} = 'undef'; + } $self->{provider} = Template::Provider->new($view_options); $self->{tt} = Template->new({ %$view_options, @@ -54,8 +56,6 @@ sub report_error { my ($self, $r, $error, $type) = @_; my $output; - warn "self : $self, r : $r, error : $error, type : $type\n"; - # Need to be very careful here. my $tt = Template->new; unless (ref $r->{config}) { @@ -63,11 +63,14 @@ sub report_error { $error .= '
There was a problem finding configuration for this request'; $r->{config} ||= {}; } + + $r->warn("report_error - reporting error to user : $error\n"); + if ($tt->process(\$error_template, { err_type => $type, error => $error, config => $r->{config}, request => $r, - paths => $self->paths($r), + paths => [ $self->paths($r) ], eval{$self->vars($r)} }, \$output )) { $r->{output} = $output; if ($tt->error) { $r->{output} = "Even the error template