Index: branches/5.2.x/core/units/helpers/image_helper.php
===================================================================
diff -u -N -r16129 -r16247
--- branches/5.2.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 16129)
+++ branches/5.2.x/core/units/helpers/image_helper.php	(.../image_helper.php)	(revision 16247)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_helper.php 16129 2015-02-22 13:37:38Z alex $
+* @version	$Id: image_helper.php 16247 2015-09-02 20:48:06Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -61,9 +61,16 @@
 				}
 				elseif (preg_match('/^fill:(.*)$/', $format_part, $regs)) {
 					$res['fill'] = $regs[1];
-				} elseif (preg_match('/^default:(.*)$/', $format_part, $regs)) {
-					$res['default'] = FULL_PATH.THEMES_PATH.'/'.$regs[1];
 				}
+				elseif ( preg_match('/^default:(.*)$/', $format_part, $regs) ) {
+					$default_image = FULL_PATH . THEMES_PATH . '/' . $regs[1];
+
+					if ( strpos($default_image, '../') !== false ) {
+						$default_image = realpath($default_image);
+					}
+
+					$res['default'] = $default_image;
+				}
 			}
 
 			return $res;
@@ -126,10 +133,14 @@
 					$params_hash = kUtil::crc32(serialize($this->fileHelper->makeRelative($params)));
 					$dst_image = preg_replace(
 						'/^' . preg_quote($src_path, '/') . '(.*)\.(.*)$/',
-						$src_path_escaped . DIRECTORY_SEPARATOR . 'resized\\1_' . $params_hash . '.\\2',
+						$src_path_escaped . '\\1_' . $params_hash . '.\\2',
 						$src_image
 					);
 
+					// Keep resized version of all images under "/system/thumbs/" folder.
+					$dst_image = preg_replace('/^' . preg_quote(FULL_PATH, '/') . '/', '', $dst_image, 1);
+					$dst_image = FULL_PATH . THUMBS_PATH . $dst_image;
+
 					$this->fileHelper->CheckFolder( dirname($dst_image) );
 
 					if (!file_exists($dst_image) || filemtime($src_image) > filemtime($dst_image)) {