* Patch from James Westby to deal with the case where you're editing a

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 499ec88346850e4540f445eb6524849323d6289f..174d2413bb93e6fc8b203def020f35f59dd61cb2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -13,6 +13,7 @@ use vars qw{%config %links %oldlinks %oldpagemtime %pagectime %pagecase
 use Exporter q{import};
 our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
+                 displaytime
                  %config %links %renderedfiles %pagesources);
 our $VERSION = 1.00;
 
@@ -320,7 +321,7 @@ sub baseurl (;$) { #{{{
 sub abs2rel ($$) { #{{{
        # Work around very innefficient behavior in File::Spec if abs2rel
        # is passed two relative paths. It's much faster if paths are
-       # absolute!
+       # absolute! (Debian bug #376658)
        my $path="/".shift;
        my $base="/".shift;
 
@@ -590,7 +591,7 @@ sub template ($;@) { #{{{
        HTML::Template->new(template_params(@_));
 } #}}}
 
-sub misctemplate ($$) { #{{{
+sub misctemplate ($$;@) { #{{{
        my $title=shift;
        my $pagebody=shift;
        
@@ -600,8 +601,12 @@ sub misctemplate ($$) { #{{{
                indexlink => indexlink(),
                wikiname => $config{wikiname},
                pagebody => $pagebody,
-       baseurl => baseurl(),
+               baseurl => baseurl(),
+               @_,
        );
+       run_hooks(pagetemplate => sub {
+               shift->(page => "", destpage => "", template => $template);
+       });
        return $template->output;
 }#}}}