diff options
| author | intrigeri <intrigeri@boum.org> | 2008-11-11 04:40:24 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-11-11 04:40:24 +0100 |
| commit | 3d8d47d7858ae0e043a28f348fe8aec444d0d35a (patch) | |
| tree | d82045e31bc409a1c14d74d13c65a051ec95922c /IkiWiki | |
| parent | 0d8cbfc5e0c1c1408d2d48707fefbd60c12b78a6 (diff) | |
| parent | 8c47f16dccd8a4dd91f365233690bd8139431249 (diff) | |
Merge commit 'upstream/master' into prv/po
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/recentchanges.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index a73ff37b9..3f70664ac 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -131,7 +131,7 @@ sub store ($$$) { #{{{ do => "recentchanges_link", page => $_->{page} ). - "\">". + "\" rel=\"nofollow\">". pagetitle($_->{page}). "</a>" } diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index c4a175677..d725ef9b3 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -44,6 +44,7 @@ sub tagpage ($) { #{{{ if ($tag !~ m{^\.?/} && defined $config{tagbase}) { $tag="/".$config{tagbase}."/".$tag; + $tag=~y#/#/#s; # squash dups } return $tag; @@ -55,13 +56,7 @@ sub taglink ($$$;@) { #{{{ my $tag=shift; my %opts=@_; - my $link=tagpage($tag); - - # Force tag creation links to create the tag under /tagbase, - # if there is a tagbase and this tag used it. - $link="/".$link if $tag ne $link; - - return htmllink($page, $destpage, $link, %opts); + return htmllink($page, $destpage, tagpage($tag), %opts); } #}}} sub preprocess_tag (@) { #{{{ |