From f0e58faefab108482e88f62db64ea6d654327d25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 18:05:30 -0500 Subject: Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links. --- IkiWiki/Plugin/recentchanges.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'IkiWiki') 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}). "" } -- cgit v1.2.3 From f8a09ba105e0b58ec59fe4cd8d92a1577cce14d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 19:48:58 -0500 Subject: tag: Normalize tagbase so leading/trailing slashes in it don't break things. --- IkiWiki/Plugin/tag.pm | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index c4a175677..7977bbcf5 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; diff --git a/debian/changelog b/debian/changelog index 566dd1954..c97647948 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (2.69) UNRELEASED; urgency=low absolute. * Add rel=nofollow to recentchanges_links for the same (weak) reasons it was earlier added to edit links. + * tag: Normalize tagbase so leading/trailing slashes in it don't break + things. -- Joey Hess Thu, 06 Nov 2008 16:01:00 -0500 -- cgit v1.2.3 From 53752bcb5d17ec51901ec926208793f9450b3243 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 10 Nov 2008 21:47:29 -0500 Subject: remove redundant link munge This is not needed now that tagpage returns a page name starting with a slash. (Also fixes a minor bug that the edit links started with double slashes due to the hack.) --- IkiWiki/Plugin/tag.pm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'IkiWiki') diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index 7977bbcf5..d725ef9b3 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -56,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 (@) { #{{{ -- cgit v1.2.3