Merge branch 'file_pruned_revamp'

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index af4bff1bc7cfba4c9e6bea452ac8ca90ac55db2c..7a85874f6e928e11e85ec57aee279b0d8197687c 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -34,13 +34,6 @@ 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 ($) {
@@ -132,15 +125,7 @@ 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));
-       }
+       return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
 }
 
 1