From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 11 Nov 2008 00:48:58 +0000 (-0500)
Subject: tag: Normalize tagbase so leading/trailing slashes in it don't break things.
X-Git-Tag: 2.69~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/f8a09ba105e0b58ec59fe4cd8d92a1577cce14d2?ds=sidebyside

tag: Normalize tagbase so leading/trailing slashes in it don't break things.
---

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 <joeyh@debian.org>  Thu, 06 Nov 2008 16:01:00 -0500