wording

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0aaf605694d9fc2a53cb5c527a3b2e38e11da506..7382f11e4202f4960895b447de94ee4fb55f6f09 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1653,29 +1653,42 @@ sub saveindex () {
 
 sub template_file ($) {
        my $name=shift;
-
-       my $template=srcfile("templates/$name", 1);
-       return $template if defined $template;
        
-       foreach my $dir ($config{templatedir},
-                        "$installdir/share/ikiwiki/templates") {
-               return "$dir/$name" if -e "$dir/$name";
+       my $tpage=($name =~ /^\//) ? $name : "templates/$name";
+       if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) {
+               $tpage=$pagesources{$tpage};
+               $name.=".tmpl";
+       }
+
+       my $template=srcfile($tpage, 1);
+       if (! defined $template) {
+               $name=~s:/::; # avoid path traversal
+               foreach my $dir ($config{templatedir},
+                                "$installdir/share/ikiwiki/templates") {
+                       if (-e "$dir/$name") {
+                               $template="$dir/$name";
+                               last;
+                       }
+               }
        }
-       return;
-}
 
-sub template ($;@) {
-       template_depends(shift, undef, @_);
+       if (defined $template) {        
+               return $template, $tpage if wantarray;
+               return $template;
+       }
+       return;
 }
 
 sub template_depends ($$;@) {
        my $name=shift;
        my $page=shift;
-
-       if (defined $page) {
-               add_depends($page, "templates/$name");
+       
+       my ($filename, $tpage)=template_file($name);
+       if (defined $page && defined $tpage) {
+               add_depends($page, $tpage);
        }
-       my $filename=template_file($name);
+
+       return unless defined $filename;
 
        require HTML::Template;
        return HTML::Template->new(
@@ -1691,6 +1704,10 @@ sub template_depends ($$;@) {
        );
 }
 
+sub template ($;@) {
+       template_depends(shift, undef, @_);
+}
+
 sub misctemplate ($$;@) {
        my $title=shift;
        my $pagebody=shift;