[Fusionforge-commits] r10869 - in trunk/src/plugins/wiki/www: . lib

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Tue Oct 5 19:56:41 CEST 2010


Author: vargenau
Date: 2010-10-05 19:56:41 +0200 (Tue, 05 Oct 2010)
New Revision: 10869

Modified:
   trunk/src/plugins/wiki/www/lib/BlockParser.php
   trunk/src/plugins/wiki/www/wikiadmin.php
Log:
Update from phpwiki

Modified: trunk/src/plugins/wiki/www/lib/BlockParser.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/BlockParser.php	2010-10-05 08:43:45 UTC (rev 10868)
+++ trunk/src/plugins/wiki/www/lib/BlockParser.php	2010-10-05 17:56:41 UTC (rev 10869)
@@ -1,4 +1,4 @@
-<?php // rcs_id('$Id: BlockParser.php 7697 2010-09-20 13:04:55Z vargenau $');
+<?php // rcs_id('$Id: BlockParser.php 7711 2010-10-05 16:08:35Z vargenau $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004,2005 Reini Urban
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -1131,6 +1131,10 @@
     var $_re = '{{';
 
     function _match (&$input, $m) {
+        // If we find "}}", this is an inline template.
+        if (strpos($m->postmatch, "}}") !== false) {
+            return false;
+        }
         $pos = $input->getPos();
         $pi = $m->postmatch;
         if ($pi[0] == '{') {

Modified: trunk/src/plugins/wiki/www/wikiadmin.php
===================================================================
--- trunk/src/plugins/wiki/www/wikiadmin.php	2010-10-05 08:43:45 UTC (rev 10868)
+++ trunk/src/plugins/wiki/www/wikiadmin.php	2010-10-05 17:56:41 UTC (rev 10869)
@@ -1,4 +1,4 @@
-<?php // -*-php-*- $Id: wikiadmin.php 7669 2010-09-02 19:40:52Z vargenau $
+<?php // -*-php-*- $Id: wikiadmin.php 7708 2010-09-22 18:19:06Z vargenau $
 /*
  * Copyright (C) 2009 Alain Peyrat, Alcatel-Lucent
  * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent




More information about the Fusionforge-commits mailing list