summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm1
-rw-r--r--debian/changelog3
-rw-r--r--doc/bugs/Trailing_slash_breaks_links.mdwn4
3 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index ad4d26741..eb003a1fb 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -541,6 +541,7 @@ sub htmllink ($$$;@) { #{{{
my $page=shift; # the page that will contain the link (different for inline)
my $link=shift;
my %opts=@_;
+ $link=~s/\/$//;
my $bestlink;
if (! $opts{forcesubpage}) {
diff --git a/debian/changelog b/debian/changelog
index c8a9fbdbc..365b9148e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ ikiwiki (2.13) UNRELEASED; urgency=low
Closes: #451666
* Fix mercurial historyurl in example setup file.
* More compact output for the brokenlinks plugin.
+ * Allow trailing slashes after page names in wikilinks.
- -- Joey Hess <joeyh@debian.org> Sat, 17 Nov 2007 15:59:54 -0500
+ -- Joey Hess <joeyh@debian.org> Sat, 17 Nov 2007 16:26:14 -0500
ikiwiki (2.12) unstable; urgency=low
diff --git a/doc/bugs/Trailing_slash_breaks_links.mdwn b/doc/bugs/Trailing_slash_breaks_links.mdwn
index a9bb6fc5d..aa03e2e91 100644
--- a/doc/bugs/Trailing_slash_breaks_links.mdwn
+++ b/doc/bugs/Trailing_slash_breaks_links.mdwn
@@ -4,4 +4,6 @@ A trailing slash on a [[wikilink]] breaks the link:
`\[[todo/Gallery]]` appears as [[todo/Gallery]].
---[[JoshTriplett]] \ No newline at end of file
+--[[JoshTriplett]]
+
+[[done]]