[phpwiki-checkins] SF.net SVN: phpwiki:[6816] trunk/lib

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

Revision: 6816
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6816&view=rev
Author:   vargenau
Date:     2009-05-28 08:53:57 +0000 (Thu, 28 May 2009)

Log Message:
-----------
Use getUploadDataPath() instead of UPLOAD_DATA_PATH

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

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2009-05-27 16:29:55 UTC (rev 6815)
+++ trunk/lib/BlockParser.php	2009-05-28 08:53:57 UTC (rev 6816)
@@ -1159,7 +1159,7 @@
 
         // It's not a Mediawiki template, it's a Wikicreole image
         if (is_image($imagename)) {
-            $this->_element = LinkImage(UPLOAD_DATA_PATH . $imagename, $alt);
+            $this->_element = LinkImage(getUploadDataPath() . $imagename, $alt);
             return true;
         }
 

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-05-27 16:29:55 UTC (rev 6815)
+++ trunk/lib/InlineParser.php	2009-05-28 08:53:57 UTC (rev 6816)
@@ -399,10 +399,10 @@
         $imgurl = substr($label, 2, -2); // Remove "{{" and "}}"
         $pipe = strpos($imgurl, '|');
         if ($pipe === false) {
-            $label = LinkImage(UPLOAD_DATA_PATH . $imgurl, $link);
+            $label = LinkImage(getUploadDataPath() . $imgurl, $link);
         } else {
             list($img, $alt) = explode("|", $imgurl);
-            $label = LinkImage(UPLOAD_DATA_PATH . $img, $alt);
+            $label = LinkImage(getUploadDataPath() . $img, $alt);
         }
     } else
     
@@ -995,7 +995,7 @@
                 // We should not hardcode "/phpwiki"
                 return LinkImage(SERVER_URL . "/phpwiki" . $imagename, $alt);
             } else {
-                return LinkImage(UPLOAD_DATA_PATH . $imagename, $alt);
+                return LinkImage(getUploadDataPath() . $imagename, $alt);
             }
         }
 


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