pagecount: Fix broken optimisation for * pagespec.
parent
8d74888235
commit
e8d8386e52
|
@ -26,8 +26,13 @@ sub preprocess (@) {
|
||||||
# register a dependency.
|
# register a dependency.
|
||||||
add_depends($params{page}, $params{pages});
|
add_depends($params{page}, $params{pages});
|
||||||
|
|
||||||
my @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page})
|
my @pages;
|
||||||
if $params{pages} ne "*"; # optimisation;
|
if ($params{pages} eq "*") {
|
||||||
|
@pages=keys %pagesources;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
@pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
|
||||||
|
}
|
||||||
return $#pages+1;
|
return $#pages+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low
|
||||||
setup file can be loaded and that its config is ok. If a plugin
|
setup file can be loaded and that its config is ok. If a plugin
|
||||||
fails for any reason, disable it in the generated file.
|
fails for any reason, disable it in the generated file.
|
||||||
Closes: 532001
|
Closes: 532001
|
||||||
|
* pagecount: Fix broken optimisation for * pagespec.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400
|
-- Joey Hess <joeyh@debian.org> Tue, 02 Jun 2009 17:03:41 -0400
|
||||||
|
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
The [[plugins/pagecount]] plugin seems to be broken, as it claims there are [[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed)
|
The [[plugins/pagecount]] plugin seems to be broken, as it claims there are [[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed)
|
||||||
|
|
||||||
|
[[fixed|done]] --[[Joey]]
|
||||||
|
|
Loading…
Reference in New Issue