Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index f4dba61a4e8e1511dff8cd9053c1c514e321be92..dc8f7d538a726f5689b6c9b51ddeb4691cc1750f 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -12,7 +12,7 @@ sub import { #{{{
        add_underlay("javascript");
        hook(type => "getsetup", id => "relativedate", call => \&getsetup);
        hook(type => "format", id => "relativedate", call => \&format);
        add_underlay("javascript");
        hook(type => "getsetup", id => "relativedate", call => \&getsetup);
        hook(type => "format", id => "relativedate", call => \&format);

-       hook(type => "displaytime", id => "relativedate", call => \&display);
+       inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);

 } # }}}
 
 sub getsetup () { #{{{
 } # }}}
 
 sub getsetup () { #{{{


@@ -43,7 +43,7 @@ sub include_javascript ($;$) { #{{{
                '" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
                '" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 

-sub display ($;$) { #{{{
+sub mydisplaytime ($;$) { #{{{

        my $time=shift;
        my $format=shift;
 
        my $time=shift;
        my $format=shift;