force rebuild from pre 20100422

[git.ikiwiki.info.git] / IkiWiki / Plugin / tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 7a85874f6e928e11e85ec57aee279b0d8197687c..8ec08e936d1b021d69d7ad9f546c3427a425920c 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -39,7 +39,7 @@ sub getsetup () {
 sub tagpage ($) {
        my $tag=shift;
                        
 sub tagpage ($) {
        my $tag=shift;
                        

-       if ($tag !~ m{^\.?/} &&
+       if ($tag !~ m{^/} &&

            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups


@@ -125,7 +125,9 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {

-       return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+       my $page=shift;
+       my $glob=shift;
+       return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag', @_);

 }
 
 1
 }
 
 1