Index: branches/5.3.x/core/units/helpers/file_helper.php
===================================================================
diff -u -N -r15902 -r15999
--- branches/5.3.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 15902)
+++ branches/5.3.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: file_helper.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: file_helper.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -379,30 +379,33 @@
 		/**
 		 * Transforms given path to file into it's url, where each each component is encoded (excluding domain and protocol)
 		 *
-		 * @param string $url
+		 * @param string      $path   Path to file.
+		 * @param string|null $domain Alternative domain to use in url.
+		 *
 		 * @return string
 		 * @access public
 		 */
-		public function pathToUrl($url)
+		public function pathToUrl($path, $domain = null)
 		{
-			$url = str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^' . preg_quote(FULL_PATH, '/') . '(.*)/', '\\1', $url, 1));
+			$path = str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^' . preg_quote(FULL_PATH, '/') . '(.*)/', '\\1', $path, 1));
 
 			// TODO: why?
-			$url = implode('/', array_map('rawurlencode', explode('/', $url)));
+			$path = implode('/', array_map('rawurlencode', explode('/', $path)));
 
-			return rtrim($this->Application->BaseURL(), '/') . $url;
+			return rtrim($this->Application->BaseURL($domain), '/') . $path;
 		}
 
 		/**
 		 * Transforms given url to path to it
 		 *
-		 * @param string $url
+		 * @param string      $url    Url.
+		 * @param string|null $domain Alternative domain to use in url.
+		 *
 		 * @return string
-		 * @access public
 		 */
-		public function urlToPath($url)
+		public function urlToPath($url, $domain = null)
 		{
-			$base_url = rtrim($this->Application->BaseURL(), '/');
+			$base_url = rtrim($this->Application->BaseURL($domain), '/');
 
 			// escape replacement patterns, like "\<number>"
 			$full_path = preg_replace('/(\\\[\d]+)/', '\\\\\1', FULL_PATH);