Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 0958f5af6f173e673aa25f0109c0e80ee91aa08a..de4b7d0686f5867a3477873b88a9d6d7074d799f 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -12,15 +12,24 @@ package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
 sub import { #{{{
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
 sub import { #{{{

+       hook(type => "getsetup", id => "pagestats", call => \&getsetup);

        hook(type => "preprocess", id => "pagestats", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "pagestats", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};


@@ -33,9 +42,9 @@ sub preprocess (@) { #{{{
        my %counts;
        my $max = 0;
        foreach my $page (keys %links) {
        my %counts;
        my $max = 0;
        foreach my $page (keys %links) {

-               if (pagespec_match($page, $params{pages})) {
-                       my @bl = IkiWiki::backlinks($page);
-                       $counts{$page} = scalar(@bl);
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
+                       use IkiWiki::Render;
+                       $counts{$page} = scalar(IkiWiki::backlinks($page));

                        $max = $counts{$page} if $counts{$page} > $max;
                }
        }
                        $max = $counts{$page} if $counts{$page} > $max;
                }
        }


@@ -44,12 +53,13 @@ sub preprocess (@) { #{{{
                return "<table class='pageStats'>\n".
                        join("\n", map {
                                "<tr><td>".
                return "<table class='pageStats'>\n".
                        join("\n", map {
                                "<tr><td>".

-                               htmllink($params{page}, $params{destpage}, $_, 1).
+                               htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).

                                "</td><td>".$counts{$_}."</td></tr>"
                        }
                        sort { $counts{$b} <=> $counts{$a} } keys %counts).
                        "\n</table>\n" ;
                                "</td><td>".$counts{$_}."</td></tr>"
                        }
                        sort { $counts{$b} <=> $counts{$a} } keys %counts).
                        "\n</table>\n" ;

-       } else {
+       }
+       else {

                # In case of misspelling, default to a page cloud
 
                my $res = "<div class='pagecloud'>\n";
                # In case of misspelling, default to a page cloud
 
                my $res = "<div class='pagecloud'>\n";