From 4dad9522e5b7ff60b65f790012507c50a49ce80a Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 14 Jan 2013 10:38:41 +0100 Subject: [PATCH] [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size --- classes/ImageType.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/ImageType.php b/classes/ImageType.php index 475c61697..69fe21065 100644 --- a/classes/ImageType.php +++ b/classes/ImageType.php @@ -143,13 +143,16 @@ class ImageTypeCore extends ObjectModel { $theme_name = Context::getContext()->shop->theme_name; $name_without_theme_name = str_replace(array('_'.$theme_name, $theme_name.'_'), '', $name); + //check if the theme name is already in $name if yes only return $name if (strstr($name, $theme_name) && self::getByNameNType($name)) return $name; else if (self::getByNameNType($name_without_theme_name.'_'.$theme_name)) return $name_without_theme_name.'_'.$theme_name; - else + else if (self::getByNameNType($theme_name.'_'.$name_without_theme_name)) return $theme_name.'_'.$name_without_theme_name; + else + return $name_without_theme_name; } } \ No newline at end of file