diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-21 19:47:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-21 19:47:38 -0400 |
| commit | 789e68a8b1a451133d9308ecd800140e2ed6f626 (patch) | |
| tree | 752f955bd5dd421891ec423ebabef07a8712cc5b /IkiWiki/Plugin | |
| parent | 8cde2365e43f1c96432dcedb378be55d2308dd08 (diff) | |
| parent | 77779dc4a09a9b686935e8e615cf2502f7125bb4 (diff) | |
Merge branch 'master' into autotag
Conflicts:
IkiWiki/Plugin/tag.pm
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index 6a6517671..72ae682f3 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -169,7 +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::taglink($glob), linktype => 'tag', @_); } 1 |