diff options
| author | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
|---|---|---|
| committer | Josh Triplett <josh@freedesktop.org> | 2008-02-09 23:02:52 -0800 |
| commit | 122f6df3259e8ca1dd96554d08cebce4b5c55acc (patch) | |
| tree | 2e1d6f54e62936792176caba483af8cc0907c755 /IkiWiki | |
| parent | fb82474be06f1be2c96bdfc231c3768cabe0d4eb (diff) | |
| parent | 8b577726ab3768d50ca7d3fdef240e37fe046fc2 (diff) | |
| download | ikiwiki-122f6df3259e8ca1dd96554d08cebce4b5c55acc.tar ikiwiki-122f6df3259e8ca1dd96554d08cebce4b5c55acc.tar.gz | |
Merge branch 'master' into prefix-directives
Conflicts:
debian/changelog
templates/change.tmpl
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Render.pm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 17b60ee94..2682e13ae 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -126,6 +126,7 @@ sub genpage ($$) { #{{{ backlinks => $backlinks, more_backlinks => $more_backlinks, mtime => displaytime($pagemtime{$page}), + ctime => displaytime($pagectime{$page}), baseurl => baseurl($page), ); @@ -327,9 +328,15 @@ sub refresh () { #{{{ } $pagecase{lc $page}=$page; if ($config{getctime} && -e "$config{srcdir}/$file") { - $pagectime{$page}=rcs_getctime("$config{srcdir}/$file"); + eval { + my $time=rcs_getctime("$config{srcdir}/$file"); + $pagectime{$page}=$time; + }; + if ($@) { + print STDERR $@; + } } - elsif (! exists $pagectime{$page}) { + if (! exists $pagectime{$page}) { $pagectime{$page}=mtime(srcfile($file)); } } |