diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-11-10 19:48:58 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-11-10 19:48:58 -0500 |
| commit | f8a09ba105e0b58ec59fe4cd8d92a1577cce14d2 (patch) | |
| tree | 5312ad0edc38036938624cb8a7587ffba8459a76 | |
| parent | 81a87988c4aa0eb95f83dffe0af08de6cf103cb0 (diff) | |
tag: Normalize tagbase so leading/trailing slashes in it don't break things.
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 1 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 0 deletions
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 |