[phpwiki-checkins] SF.net SVN: phpwiki:[7717] trunk/lib/InlineParser.php

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

Revision: 7717
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7717&view=rev
Author:   vargenau
Date:     2010-10-20 16:36:22 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
Allow {{ image.png}} (space before image name)

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010-10-20 16:19:40 UTC (rev 7716)
+++ trunk/lib/InlineParser.php	2010-10-20 16:36:22 UTC (rev 7717)
@@ -2,7 +2,7 @@
 // rcs_id('$Id$');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
  * 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);
             }
         }


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