// Renamed images types for the default theme (in order to avoid conflicts) #PSCFV-4242

install-dev/classes/xmlLoader.php

@@ -674,7 +674,7 @@ class InstallXmlLoader
 				@chmod($target_file, 0644);
 			}
 			// Resize the image if no cache was prepared in fixtures
-			else if (!ImageManager::resize($path.$id.'.jpg', $target_file, $type['width'], $type['height']))
+			else if (!ImageManager::resize($path.$identifier.'.jpg', $target_file, $type['width'], $type['height']))
 				$this->setError($this->language->l('Cannot create image "%1$s" for entity "%2$s"', $identifier.'-'.$type['name'], 'product'));
 		}
 	}

install-dev/data/xml/image_type.xml

@@ -12,13 +12,13 @@
     <field name="stores"/>
   </fields>
   <entities>
-    <image_type id="small" name="small" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="medium" name="medium" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
-    <image_type id="large" name="large" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
-    <image_type id="thickbox" name="thickbox" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="category" name="category" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="home" name="home" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
-    <image_type id="large_scene" name="large_scene" width="520" height="189" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
-    <image_type id="thumb_scene" name="thumb_scene" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+    <image_type id="small_default" name="small_default" width="45" height="45" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="medium_default" name="medium_default" width="58" height="58" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="1"/>
+    <image_type id="large_default" name="large_default" width="264" height="264" products="1" categories="1" manufacturers="1" suppliers="1" scenes="0" stores="0"/>
+    <image_type id="thickbox_default" name="thickbox_default" width="600" height="600" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="category_default" name="category_default" width="500" height="150" products="0" categories="1" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="home_default" name="home_default" width="124" height="124" products="1" categories="0" manufacturers="0" suppliers="0" scenes="0" stores="0"/>
+    <image_type id="scene_default" name="scene_default" width="520" height="189" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
+    <image_type id="m_scene_default" name="m_scene_default" width="161" height="58" products="0" categories="0" manufacturers="0" suppliers="0" scenes="1" stores="0"/>
   </entities>
 </entity_image_type>