added sensible defaults to template so less whitespace waste

[maypole.git] / lib / Maypole / View / TT.pm

diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index 936fcc51fc8fa7668a3a5a29b3a7d8bfb4cedc41..8759e0cba9206754a24783b7b82de80cb0e1d8f9 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -1,21 +1,28 @@
 package Maypole::View::TT;
-use Class::C3;
 use base 'Maypole::View::Base';
 use Maypole::Constants;
 use Template;
 use File::Spec::Functions qw(catdir tmpdir);
+use Template::Constants qw( :all );
 
 our $error_template;
 { local $/; $error_template = <DATA>; }
 
-our $VERSION = '2.11';
+our $VERSION = '2.13';
+
+my $debug_flags = DEBUG_ON;
 
 use strict;
 
 sub template {
   my ( $self, $r ) = @_;
   unless ($self->{tt}) {
-    my $view_options = $r->config->view_options || {};
+    my $view_options = $r->config->view_options || { POST_CHOMP=>1, PRE_CHOMP=>1, TRIM=>1 };
+    if ($r->debug) {
+      $view_options->{DEBUG} = $debug_flags;
+    }
+
+    $view_options->{POST_CHOMP} = 1 unless (exists $view_options->{POST_CHOMP});
     $self->{provider} = Template::Provider->new($view_options);
     $self->{tt}       = Template->new({
                                       %$view_options,
@@ -57,7 +64,7 @@ sub report_error {
     # Need to be very careful here.
     my $tt = Template->new;
     unless (ref $r->{config}) {
-      warn "no config for this request\n";
+      $r->warn("no config for this request");
       $error .= '<br> There was a problem finding configuration for this request';
       $r->{config} ||= {};
     }