From 55e16be44a2aa1da578ef896ebac40095f606e15 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Jan 2008 02:29:12 -0500 Subject: [PATCH] move recentchanges link enabling into a pagetemplate hook --- IkiWiki/Plugin/recentchanges.pm | 13 +++++++++++++ IkiWiki/Render.pm | 6 ------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 5ac0a30ef..8ceb2dfbf 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -9,6 +9,7 @@ sub import { #{{{ hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig); hook(type => "refresh", id => "recentchanges", call => \&refresh); hook(type => "htmlize", id => "_change", call => \&htmlize); + hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate); } #}}} sub checkconfig () { #{{{ @@ -32,6 +33,18 @@ sub refresh ($) { #{{{ } } #}}} +# Enable the recentchanges link on wiki pages. +sub pagetemplate (@) { #{{{ + my %params=@_; + my $template=$params{template}; + my $page=$params{page}; + if ($config{rcs} && $page ne $config{recentchangespage} && + $template->query(name => "recentchangesurl")) { + $template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); + $template->param(have_actions => 1); + } +} #}}} + # Pages with extension _change have plain html markup, pass through. sub htmlize (@) { #{{{ my %params=@_; diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index be5af84ba..6dc70beb5 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -85,12 +85,6 @@ sub genpage ($$) { #{{{ $actions++; } - if ($config{rcs} && exists $config{recentchangespage} && - $page ne $config{recentchangespage}) { - $template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); - $actions++; - } - if (length $config{historyurl}) { my $u=$config{historyurl}; $u=~s/\[\[file\]\]/$pagesources{$page}/g; -- 2.26.2