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 af4bff1bc7cfba4c9e6bea452ac8ca90ac55db2c..8ec08e936d1b021d69d7ad9f546c3427a425920c 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,19 +34,12 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
-               tagged_is_strict => {
-                       type => "boolean",
-                       default => 0,
-                       description => "if 1, tagged() doesn't match normal WikiLinks to tag pages",
-                       safe => 1,
-                       rebuild => 1,
-               },
 }
 
 sub tagpage ($) {
        my $tag=shift;
                        
-       if ($tag !~ m{^\.?/} &&
+       if ($tag !~ m{^/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
@@ -132,15 +125,9 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
-       my $page = shift;
-       my $glob = shift;
-
-       if ($IkiWiki::config{tagged_is_strict}) {
-               return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag');
-       }
-       else {
-               return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
-       }
+       my $page=shift;
+       my $glob=shift;
+       return match_link($page, IkiWiki::Plugin::tag::tagpage($glob), linktype => 'tag', @_);
 }
 
 1