Index: branches/5.2.x/core/units/helpers/image_helper.php =================================================================== diff -u -N -r16029 -r16129 --- branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 16029) +++ branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 16129) @@ -1,6 +1,6 @@ change resulting image name ! - $src_path_escaped = preg_replace('/(\\\[\d]+)/', '\\\\\1', $src_path); // escape replacement patterns, like "\" - $dst_image = preg_replace('/^'.preg_quote($src_path, '/').'(.*)\.(.*)$/', $src_path_escaped . DIRECTORY_SEPARATOR . 'resized\\1_' . crc32(serialize($params)) . '.\\2', $src_image); + // Resize required OR watermarking required -> change resulting image name ! + if ( $needs_resize || array_intersect(array_keys($params), $transform_keys) ) { + // Escape replacement patterns, like "\". + $src_path_escaped = preg_replace('/(\\\[\d]+)/', '\\\\\1', $src_path); + $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_image + ); $this->fileHelper->CheckFolder( dirname($dst_image) );