attachment: Fix attachment file size display.

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index cd7ecc212fd7c928560ade98d34366ae9da45999..55064a9a3cef72c92f3ebc3cb43fa9ef7646d256 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
                },
                tag_autocreate => {
                        type => "boolean",
                },
                tag_autocreate => {
                        type => "boolean",

-                       example => 0,
+                       example => 1,

                        description => "autocreate new tag pages?",
                        safe => 1,
                        rebuild => undef,
                        description => "autocreate new tag pages?",
                        safe => 1,
                        rebuild => undef,


@@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
        my $tag=shift;
 
 sub gentag ($) {
        my $tag=shift;
 

-       if ($config{tag_autocreate}) {
+       if ($config{tag_autocreate} ||
+           ($config{tagbase} && ! defined $config{tag_autocreate})) {

                my $tagpage=taglink($tag);
                if ($tagpage=~/^\.\/(.*)/) {
                        $tagpage=$1;
                my $tagpage=taglink($tag);
                if ($tagpage=~/^\.\/(.*)/) {
                        $tagpage=$1;


@@ -89,7 +90,7 @@ sub gentag ($) {
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);
                        if ($config{rcs}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);

-                               IkiWiki::rcs_commit_staged($message, undef, undef);
+                               IkiWiki::rcs_commit_staged(message => $message);

                                IkiWiki::enable_commit_hook();
                        }
                });
                                IkiWiki::enable_commit_hook();
                        }
                });