// Merge with revision 7841

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
parent c945049ef1
commit ffeb22bfb9
130 changed files with 6620 additions and 18585 deletions
@@ -538,6 +538,8 @@ class ImageCore extends ObjectModel
 				if (!$image || $image->id !== (int)$matches[2])
 					$image = new Image((int)$matches[2]);

+				if (Validate::isLoadedObject($image))
+				{
 				// create the new folder if it does not exist
 				if (!$image->createImgFolder())
 					return false;
@@ -549,6 +551,7 @@ class ImageCore extends ObjectModel
 				if (!@rename(_PS_PROD_IMG_DIR_.$file, $new_path) || !file_exists($new_path))
 					return false;
 				}
+			}
 			if ((int)$max_execution_time != 0 && (time() - $start_time > (int)$max_execution_time - 4))
 				return 'timeout';
 		}