Don't allow newlines in link text in a wikilink.

master
joey 2007-08-28 22:54:54 +00:00
parent 4da3838bd6
commit 25294defb8
2 changed files with 3 additions and 2 deletions

View File

@ -39,7 +39,7 @@ sub defaultconfig () { #{{{
wiki_link_regexp => qr{ wiki_link_regexp => qr{
\[\[ # beginning of link \[\[ # beginning of link
(?: (?:
([^\]\|]+) # 1: link text ([^\]\|\n]+) # 1: link text
\| # followed by '|' \| # followed by '|'
)? # optional )? # optional

3
debian/changelog vendored
View File

@ -9,8 +9,9 @@ ikiwiki (2.7) UNRELEASED; urgency=low
* Allow -cgi -wrapper to be passed on the command line to generate a * Allow -cgi -wrapper to be passed on the command line to generate a
wrapper. wrapper.
* Fix some taint issues with generating wrappers using the command line. * 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 ikiwiki (2.6.1) unstable; urgency=low