[Fusionforge-commits] r11088 - trunk/src/plugins/wiki/www/lib

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Wed Oct 20 21:53:20 CEST 2010


Author: vargenau
Date: 2010-10-20 21:53:20 +0200 (Wed, 20 Oct 2010)
New Revision: 11088

Modified:
   trunk/src/plugins/wiki/www/lib/InlineParser.php
Log:
Phpwiki: Allow {{ image.png}} (space before image name)

Modified: trunk/src/plugins/wiki/www/lib/InlineParser.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/InlineParser.php	2010-10-20 19:52:14 UTC (rev 11087)
+++ trunk/src/plugins/wiki/www/lib/InlineParser.php	2010-10-20 19:53:20 UTC (rev 11088)
@@ -1,8 +1,8 @@
 <?php
-// rcs_id('$Id: InlineParser.php 7638 2010-08-11 11:58:40Z vargenau $');
+// rcs_id('$Id: InlineParser.php 7717 2010-10-20 16:36:22Z vargenau $');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
  * Copyright (C) 2004-2010 Reini Urban
- * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  *
@@ -1021,6 +1021,7 @@
     function markup ($match) {
 
         $page = substr($match,2,-2);
+        $page = trim($page);
 
         // Check for predefined icons.
         $predefinedicons = array(":)" => "ic_smile.png",
@@ -1046,7 +1047,7 @@
                                  "(*y)" => "ic_yellowstar.png",
                                 );
         foreach ($predefinedicons as $ascii => $icon) {
-            if (trim($page) == $ascii) {
+            if ($page == $ascii) {
                 return LinkImage(DATA_PATH . "/themes/default/images/$icon", $page);
             }
         }




More information about the Fusionforge-commits mailing list