diff options
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 0485da75c..6d89adddf 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -39,7 +39,7 @@ sub defaultconfig () { #{{{ wiki_link_regexp => qr{ \[\[ # beginning of link (?: - ([^\]\|]+) # 1: link text + ([^\]\|\n]+) # 1: link text \| # followed by '|' )? # optional diff --git a/debian/changelog b/debian/changelog index 63b03ef3b..edb019c0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,9 @@ ikiwiki (2.7) UNRELEASED; urgency=low * Allow -cgi -wrapper to be passed on the command line to generate a wrapper. * Fix some taint issues with generating wrappers using the command line. + * Don't allow newlines in link text in a wikilink. - -- Joey Hess <joeyh@debian.org> Tue, 28 Aug 2007 17:11:30 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 28 Aug 2007 18:54:06 -0400 ikiwiki (2.6.1) unstable; urgency=low |