mention prefix_directives

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index e4ff2b39b9fdfeb579f31cca750017ec4ad7cb41..4fefadf09d5994c982735da22f6da194a563be50 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -55,8 +55,8 @@ sub parentlinks ($) { #{{{
        my $path="";
        my $title=$config{wikiname};
        
        my $path="";
        my $title=$config{wikiname};
        

-       return if $page eq 'index'; # toplevel

        foreach my $dir (split("/", $page)) {
        foreach my $dir (split("/", $page)) {

+               next if $dir eq 'index';

                push @ret, { url => urlto($path, $page), page => $title };
                $path.="/".$dir;
                $title=pagetitle($dir);
                push @ret, { url => urlto($path, $page), page => $title };
                $path.="/".$dir;
                $title=pagetitle($dir);


@@ -64,10 +64,9 @@ sub parentlinks ($) { #{{{
        return @ret;
 } #}}}
 
        return @ret;
 } #}}}
 

-sub genpage ($$$) { #{{{
+sub genpage ($$) { #{{{

        my $page=shift;
        my $content=shift;
        my $page=shift;
        my $content=shift;

-       my $mtime=shift;

 
        my $templatefile;
        run_hooks(templatefile => sub {
 
        my $templatefile;
        run_hooks(templatefile => sub {


@@ -129,7 +128,7 @@ sub genpage ($$$) { #{{{
                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,
                content => $content,
                backlinks => $backlinks,
                more_backlinks => $more_backlinks,

-               mtime => displaytime($mtime),
+               mtime => displaytime($pagemtime{$page}),

                baseurl => baseurl($page),
        );
 
                baseurl => baseurl($page),
        );
 


@@ -204,8 +203,9 @@ sub render ($) { #{{{
                        filter($page, $page,
                        readfile($srcfile)))));
                
                        filter($page, $page,
                        readfile($srcfile)))));
                

-               writefile(htmlpage($page), $config{destdir},
-                       genpage($page, $content, mtime($srcfile)));
+               my $output=htmlpage($page);
+               writefile($output, $config{destdir}, genpage($page, $content));
+               utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);

        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);
        }
        else {
                my $srcfd=readfile($srcfile, 1, 1);


@@ -231,6 +231,7 @@ sub render ($) { #{{{
                                }
                        }
                });
                                }
                        }
                });

+               utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);

        }
 } #}}}
 
        }
 } #}}}
 


@@ -485,8 +486,9 @@ sub commandline_render () { #{{{
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);
        $content=preprocess($page, $page, $content);
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $type, $content);

+       $pagemtime{$page}=mtime($srcfile);

 
 

-       print genpage($page, $content, mtime($srcfile));
+       print genpage($page, $content);

        exit 0;
 } #}}}
 
        exit 0;
 } #}}}