Merge branch 'master' into autotag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 72ae682f3121f31df87bed58dce79341f58abd07..cd7ecc212fd7c928560ade98d34366ae9da45999 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -46,7 +46,7 @@ sub getsetup () {
 sub taglink ($) {
        my $tag=shift;
        
 sub taglink ($) {
        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


@@ -79,12 +79,12 @@ sub gentag ($) {
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
                add_autofile($tagfile, "tag", sub {
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
                add_autofile($tagfile, "tag", sub {

-                       my $message=sprintf(gettext("creating tag page %s"), $tag);
+                       my $message=sprintf(gettext("creating tag page %s"), $tagpage);

                        debug($message);
 
                        my $template=template("autotag.tmpl");
                        debug($message);
 
                        my $template=template("autotag.tmpl");

-                       $template->param(tag => IkiWiki::basename($tag));
-                       $template->param(tagpage => $tagpage);
+                       $template->param(tagname => IkiWiki::basename($tag));
+                       $template->param(tag => $tag);

                        writefile($tagfile, $config{srcdir}, $template->output);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                        writefile($tagfile, $config{srcdir}, $template->output);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();


@@ -170,8 +170,8 @@ package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
        my $page=shift;
 
 sub match_tagged ($$;@) {
        my $page=shift;

-       my $glob=shift;
-       return match_link($page, IkiWiki::Plugin::tag::taglink($glob), linktype => 'tag', @_);
+       my $glob=IkiWiki::Plugin::tag::taglink(shift);
+       return match_link($page, $glob, linktype => 'tag', @_);

 }
 
 1
 }
 
 1