* Make pagespec merge code smarter about merging duplicate pagespecs.

master
joey 2006-08-23 06:44:47 +00:00
parent 80af21bff2
commit c9dbcd29e5
2 changed files with 4 additions and 1 deletions

View File

@ -544,6 +544,8 @@ sub pagespec_merge ($$) { #{{{
my $a=shift;
my $b=shift;
return $a if $a eq $b;
# Support for old-style GlobLists.
if (is_globlist($a)) {
$a=globlist_to_pagespec($a);

3
debian/changelog vendored
View File

@ -13,8 +13,9 @@ ikiwiki (1.22) UNRELEASED; urgency=low
* Add a template plugin.
* Use the template plugin to add infoboxes to each plugin page listing basic
info about the plugin.
* Make pagespec merge code smarter about merging duplicate pagespecs.
-- Joey Hess <joeyh@debian.org> Tue, 22 Aug 2006 23:09:46 -0400
-- Joey Hess <joeyh@debian.org> Wed, 23 Aug 2006 02:38:34 -0400
ikiwiki (1.21) unstable; urgency=low