[phpwiki-checkins] CVS: phpwiki/lib InlineParser.php,1.92,1.93

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1801

Modified Files:
	InlineParser.php 
Log Message:
Fix Bug#1802827 Template does not get expanded with {{ }} syntax.
by vargenau


Index: InlineParser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/InlineParser.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -2 -b -p -d -r1.92 -r1.93
--- InlineParser.php	10 Aug 2007 21:58:01 -0000	1.92
+++ InlineParser.php	26 Sep 2007 16:54:34 -0000	1.93
@@ -798,5 +798,5 @@ class Markup_xml_plugin extends Balanced
  *  {{template}}
  * => < ? plugin Template page=template ? >
- *  {{template|var=value|...}}
+ *  {{template|var1=value1|var2=value|...}}
  * => < ? plugin Template page=template var=value ... ? >
  */
@@ -808,5 +808,5 @@ class Markup_template_plugin  extends Si
     function markup ($match) {
         $page = substr(str_replace("\n", "", $match),2,-2); $vars = '';
-        if (preg_match('/^(\S+)\|(.*)$/', $page, $_m)) {
+        if (preg_match('/^(\S+?)\|(.*)$/', $page, $_m)) {
             $page = $_m[1];
             $vars = '"' . preg_replace('/\|/', '" "', $_m[2]) . '"'; 
@@ -1078,4 +1078,8 @@ function TransformInlineNowiki($text, $m
 
 // $Log$
+// Revision 1.93  2007/09/26 16:54:34  rurban
+// Fix Bug#1802827 Template does not get expanded with {{ }} syntax.
+// by vargenau
+//
 // Revision 1.92  2007/08/10 21:58:01  rurban
 // Improve SemanticLink parsings: