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

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

Revision: 6797
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6797&view=rev
Author:   vargenau
Date:     2009-04-19 18:32:17 +0000 (Sun, 19 Apr 2009)

Log Message:
-----------
Allow absolute path for image

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-04-19 18:26:36 UTC (rev 6796)
+++ trunk/lib/InlineParser.php	2009-04-19 18:32:17 UTC (rev 6797)
@@ -27,8 +27,6 @@
  * @package Markup
  * @author Geoffrey T. Dairiki, Reini Urban
  */
-/**
- */
 
 /**
  * This is the character used in wiki markup to escape characters with
@@ -980,7 +978,12 @@
 
         // It's not a Mediawiki template, it's a Wikicreole image
         if (is_image($imagename)) {
-            return LinkImage(UPLOAD_DATA_PATH . $imagename, $alt);
+            if ($imagename[0] == '/') {
+                // We should not hardcode "/phpwiki"
+                return LinkImage(SERVER_URL . "/phpwiki" . $imagename, $alt);
+            } else {
+                return LinkImage(UPLOAD_DATA_PATH . $imagename, $alt);
+            }
         }
 
         $page = str_replace("\n", "", $page); 


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