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 c4a1756779126c53a265f9e40c82dcdc97c7a52c..7977bbcf567887e63a66f8487bf327cdf5419e0c 100644 (file)
--- 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 566dd19544a942e76e37fd8dd3bdb0ebec5eec75..c9764794821cd2f8d65032b525b6fa4462b7c0eb 100644 (file)
--- 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