From dc05fe5c13f26146ef374e8fc39e3423b56cfb7d Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Mon, 17 Mar 2008 19:06:39 +0000
Subject: [PATCH] fix bug#1904088  Some brackets links with \n cause the parser
 to crash

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@6010 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/InlineParser.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/InlineParser.php b/lib/InlineParser.php
index e8a3ac689..f08ae58fa 100644
--- a/lib/InlineParser.php
+++ b/lib/InlineParser.php
@@ -1,5 +1,5 @@
 <?php 
-rcs_id('$Id: InlineParser.php,v 1.95 2008-02-15 20:02:49 vargenau Exp $');
+rcs_id('$Id: InlineParser.php,v 1.96 2008-03-17 19:06:39 rurban Exp $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki@dairiki.org>
  * Copyright (C) 2004,2005,2006,2007 Reini Urban
  *
@@ -328,10 +328,11 @@ function LinkBracketLink($bracketlink) {
     // be either a page name, a URL or both separated by a pipe.
     
     // Strip brackets and leading space
-    // FIXME: \n inside [] will lead to errors
+    // bug#1904088  Some brackets links on 2 lines cause the parser to crash 
     preg_match('/(\#?) \[\s* (?: (.*?) \s* (?<!' . ESCAPE_CHAR . ')(\|) )? \s* (.+?) \s*\]/x',
-	       $bracketlink, $matches);
+	       str_replace("\n", "", $bracketlink), $matches);
     if (count($matches) < 4) {
+    	// "[ personal\ninformation manager | PhpWiki:PersonalWiki ]"
     	trigger_error(_("Invalid [] syntax ignored").": ".$bracketlink, E_USER_WARNING);
     	return new Cached_Link;
     }
@@ -1098,6 +1099,9 @@ function TransformInlineNowiki($text, $markup = 2.0, $basepage=false) {
 
 
 // $Log: not supported by cvs2svn $
+// Revision 1.95  2008/02/15 20:02:49  vargenau
+// Allow <s> to strike; update Help for <s> and <strike>
+//
 // Revision 1.94  2008/01/31 20:40:10  vargenau
 // Implemented Mediawiki-like syntax for tables
 //
-- 
2.45.0