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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0485da75c74e83cfc9a8245568e6cfb8079f0f66..6d89adddf78a24792f8b986eaee0446b6caa98d9 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -39,7 +39,7 @@ sub defaultconfig () { #{{{
        wiki_link_regexp => qr{
                \[\[                    # beginning of link
                (?:
        wiki_link_regexp => qr{
                \[\[                    # beginning of link
                (?:

-                       ([^\]\|]+)      # 1: link text
+                       ([^\]\|\n]+)      # 1: link text

                        \|              # followed by '|'
                )?                      # optional
                
                        \|              # followed by '|'
                )?                      # optional
                

diff --git a/debian/changelog b/debian/changelog
index 63b03ef3b988051c5c8a60b9a36c982044430f10..edb019c0c3eea632cdc8ba69bc9385bca730e2ac 100644 (file)
--- 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.
   * 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
 
 
 ikiwiki (2.6.1) unstable; urgency=low