diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /IkiWiki/Plugin/pagecount.pm | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'IkiWiki/Plugin/pagecount.pm')
| -rw-r--r-- | IkiWiki/Plugin/pagecount.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm index 1955603b0..5a2301af4 100644 --- a/IkiWiki/Plugin/pagecount.pm +++ b/IkiWiki/Plugin/pagecount.pm @@ -26,8 +26,13 @@ sub preprocess (@) { # register a dependency. add_depends($params{page}, $params{pages}); - my @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page}) - if $params{pages} ne "*"; # optimisation; + my @pages; + if ($params{pages} eq "*") { + @pages=keys %pagesources; + } + else { + @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page}); + } return $#pages+1; } |