put back recentchangesurl

On second thought, misctemplate can use pagetemplate hooks to provide
it, so it's better to keep back-compat, and allow full customisation
of how it's displayed via the template.

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 0ee8f0e6671fcb9be708cab7a9e230a9587baded..e546e4702b43bda681e74996a51bcc6e6e3c0499 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -11,8 +11,6 @@ sub import {
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
        hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
        hook(type => "refresh", id => "recentchanges", call => \&refresh);
        hook(type => "getsetup", id => "recentchanges", call => \&getsetup);
        hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig);
        hook(type => "refresh", id => "recentchanges", call => \&refresh);

-       hook(type => "pageactions", id => "recentchanges", call => \&pageactions,
-               first => 1);

        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "htmlize", id => "_change", call => \&htmlize);
        # Load goto to fix up links from recentchanges
        hook(type => "pagetemplate", id => "recentchanges", call => \&pagetemplate);
        hook(type => "htmlize", id => "_change", call => \&htmlize);
        # Load goto to fix up links from recentchanges


@@ -62,20 +60,7 @@ sub refresh ($) {
        }
 }
 
        }
 }
 

-# Enable the recentchanges link on wiki pages.
-sub pageactions (@) {
-       my %params=@_;
-       my $page=$params{page};
-
-       if (defined $config{recentchangespage} && $config{rcs} &&
-           $page ne $config{recentchangespage}) {
-               return htmllink($page, $page, $config{recentchangespage},
-                       linktext => gettext("RecentChanges"));
-       }
-}
-
-# Backwards compatability for templates still using
-# RECENTCHANGESURL.
+# Enable the recentchanges link.

 sub pagetemplate (@) {
        my %params=@_;
        my $template=$params{template};
 sub pagetemplate (@) {
        my %params=@_;
        my $template=$params{template};

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 049d31ad5e244299c56d5ef59303ac30b3c17aab..3bb7197f0e8e84f9fd22ce76dab9488478bdb899 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -61,6 +61,9 @@
 <TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
 <TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>

+<TMPL_IF RECENTCHANGESURL>
+<li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
+</TMPL_IF>

 <TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
 <TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>