]> git.decadent.org.uk Git - maypole.git/commitdiff
projects / maypole.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 55afe5b)
fixed bug with multiple template roots in TT, fixed bug with frontpage path of /...
authorAaron Trevena <aaron.trevena@gmail.com>
Mon, 6 Nov 2006 14:04:33 +0000 (14:04 +0000)
committerAaron Trevena <aaron.trevena@gmail.com>
Mon, 6 Nov 2006 14:04:33 +0000 (14:04 +0000)
git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@551 48953598-375a-da11-a14b-00016c27c3ee

Changes patch | blob | history
lib/Maypole.pm patch | blob | history
lib/Maypole/View/Base.pm patch | blob | history
lib/Maypole/View/TT.pm patch | blob | history

diff --git a/Changes b/Changes
index 3006775159542d1c410e44c736d9e2d327d10eb9..e5f081c90c75ebdaeb40b8052cbdea3ba9ff4149 100644 (file)
--- a/Changes
+++ b/Changes
@@ -20,6 +20,7 @@ For information about current developments and future releases, see:
    small improvements to some factory templates
    fix to path handling in mod_perl and CGI when location ends in /
    fixed template path ordering so i.e. /tablename/list is used before /list when provided with a tablename
+   fixed template path with array refs
 
 2.11 Mon 31 July 2006
 
diff --git a/lib/Maypole.pm b/lib/Maypole.pm
index 5e85cdfe59b45b23e7cf16905b45598a926593ba..858437e39fadc75d1a4ab6ea3543ab5be58f513d 100644 (file)
--- a/lib/Maypole.pm
+++ b/lib/Maypole.pm
@@ -985,7 +985,11 @@ sub parse_path
     # conditionally, broke lots of tests, hence this:
     $self->$_(undef) for qw/action table args/;
     $self->preprocess_path;
-    $self->path || $self->path('frontpage');
+
+    # use frontpage template for frontpage
+    unless ($self->path && $self->path ne '/') {
+      $self->path('frontpage');
+    }
 
     my @pi = grep {length} split '/', $self->path;
 
diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index 0e9378fd465d15cbd60613304fb44f9456f7eba3..753430a20742c292de347c35b7e7dc56ea4124a3 100644 (file)
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -10,7 +10,6 @@ sub new { bless {}, shift }    # By default, do nothing.
 
 sub paths {
     my ( $self, $r ) = @_;
-    warn "paths called with @_";
     my $root = $r->config->template_root || $r->get_template_root;
     if(ref($root) ne 'ARRAY') {
        $root = [ $root ];
diff --git a/lib/Maypole/View/TT.pm b/lib/Maypole/View/TT.pm
index e4867fc73450d2964b9eb3cee7d73e974c2de804..936fcc51fc8fa7668a3a5a29b3a7d8bfb4cedc41 100644 (file)
--- a/lib/Maypole/View/TT.pm
+++ b/lib/Maypole/View/TT.pm
@@ -54,8 +54,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 +61,14 @@ sub report_error {
       $error .= '<br> 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} = "<html><body>Even the error template
Package: Maypole [unmaintained]