[phpwiki-checkins] SF.net SVN: phpwiki:[6605] trunk/lib/BlockParser.php

[<var...@us...>]

Revision: 6605
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6605&view=rev
Author:   vargenau
Date:     2009-02-28 20:03:55 +0000 (Sat, 28 Feb 2009)

Log Message:
-----------
Allow <<<x>>> and {{{x}}} at start of line

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2009-02-28 13:55:59 UTC (rev 6604)
+++ trunk/lib/BlockParser.php	2009-02-28 20:03:55 UTC (rev 6605)
@@ -1042,7 +1042,11 @@
 
     function _match (&$input, $m) {
         $pos = $input->getPos();
-        $pi = "<?plugin " . $m->postmatch;
+        $pi = $m->postmatch;
+        if ($pi[0] == '<') {
+            return false;
+        }
+        $pi = "<?plugin " . $pi;
         while (!preg_match('/(?<!'.ESCAPE_CHAR.')>>\s*$/', $pi)) {
             if (($line = $input->nextLine()) === false) {
                 $input->setPos($pos);
@@ -1128,8 +1132,10 @@
 
     function _match (&$input, $m) {
         $pos = $input->getPos();
-        // $pi = "<?plugin Template page=" . $m->postmatch;
         $pi = $m->postmatch;
+        if ($pi[0] == '{') {
+            return false;
+        }
         while (!preg_match('/(?<!'.ESCAPE_CHAR.')}}\s*$/', $pi)) {
             if (($line = $input->nextLine()) === false) {
                 $input->setPos($pos);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.