* Don't allow whitespace in link text in a wikilink. This was still

  allowed by the regexp in one case though not documented to work, and
  was ambiguous with preprocessor directives.

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 0b9790d8a15078f242e21db3ab80e14084eab09d..1c87831879afd5f154983123d3da1b7b188758ee 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -39,7 +39,7 @@ sub defaultconfig () { #{{{
        wiki_link_regexp => qr{
                \[\[                    # beginning of link
                (?:
-                       ([^\]\|\n]+)    # 1: link text
+                       ([^\]\|\n\s]+)  # 1: link text
                        \|              # followed by '|'
                )?                      # optional
                

diff --git a/debian/changelog b/debian/changelog
index 97bf74136cac46d991208f2da755d05a435dbf57..081af219f04a594cf365c506f1a835bb7df4fbfc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,11 @@ ikiwiki (2.9) UNRELEASED; urgency=low
     files in some situations, and this is appropriate in some cases, such as
     the teximg plugin's error log file.
     Such files will be automatically cleaned up at an appopriate later time.
+  * Don't allow whitespace in link text in a wikilink. This was still
+    allowed by the regexp in one case though not documented to work, and
+    was ambiguous with preprocessor directives.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 22 Sep 2007 14:19:58 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 24 Sep 2007 12:48:35 -0400
 
 ikiwiki (2.8) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index f5b77b2664d324ed4e09d7a811169252dd53c732..626eb2ba52975b39fef20b4315a66b82f5c78d6f 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-21 13:25-0400\n"
+"POT-Creation-Date: 2007-09-24 12:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,17 +53,17 @@ msgstr ""
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:523 ../IkiWiki/CGI.pm:533
-#: ../IkiWiki/CGI.pm:566 ../IkiWiki/CGI.pm:610
+#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534
+#: ../IkiWiki/CGI.pm:567 ../IkiWiki/CGI.pm:611
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:704
+#: ../IkiWiki/CGI.pm:705
 msgid "You are banned."
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:724
+#: ../IkiWiki/CGI.pm:725
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
@@ -605,7 +605,7 @@ msgstr ""
 #. translators: preprocessor directive name,
 #. translators: the second a page name, the
 #. translators: third a number.
-#: ../IkiWiki.pm:705
+#: ../IkiWiki.pm:708
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr ""