Index: branches/RC/core/units/general/helpers/image_helper.php =================================================================== diff -u -N -r11305 -r11721 --- branches/RC/core/units/general/helpers/image_helper.php (.../image_helper.php) (revision 11305) +++ branches/RC/core/units/general/helpers/image_helper.php (.../image_helper.php) (revision 11721) @@ -64,7 +64,7 @@ if ($needs_resize || array_key_exists('wm_filename', $params) && $params['wm_filename']) { // resize required OR watermarking required -> change resulting image name ! - $dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path.'/resized\\1_'.crc32(serialize($params)).'.\\2', $src_image); + $dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path . DIRECTORY_SEPARATOR . 'resized\\1_' . crc32(serialize($params)) . '.\\2', $src_image); if (!file_exists($dst_image) || filemtime($src_image) > filemtime($dst_image)) { // resized image not available OR should be recreated due source image change $params['dst_image'] = $dst_image; @@ -87,7 +87,7 @@ } $base_url = rtrim($this->Application->BaseURL(), '/'); - return preg_replace('/^'.preg_quote(FULL_PATH, '/').'(.*)/', $base_url.'\\1', $src_image); + return str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^'.preg_quote(FULL_PATH, '/').'(.*)/', $base_url.'\\1', $src_image)); } /**