From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 23:47:38 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Tag: 3.20100427~62^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=789e68a8b1a451133d9308ecd800140e2ed6f626;p=ikiwiki.git

Merge branch 'master' into autotag

Conflicts:
	IkiWiki/Plugin/tag.pm
---

789e68a8b1a451133d9308ecd800140e2ed6f626
diff --cc IkiWiki/Plugin/tag.pm
index 6a6517671,62e0cc3b8..72ae682f3
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@@ -169,7 -125,9 +169,9 @@@ sub pagetemplate (@) 
  package IkiWiki::PageSpec;
  
  sub match_tagged ($$;@) {
- 	return match_link($_[0], IkiWiki::Plugin::tag::taglink($_[1]), linktype => 'tag');
+ 	my $page=shift;
+ 	my $glob=shift;
 -	return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag', @_);
++	return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
  }
  
  1