Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

classes/Image.php

@@ -367,6 +367,18 @@ class ImageCore extends ObjectModel
 			');
 	 	return self::$_cacheGetSize[$type];
 	}
+	
+	public static function getWidth($params, &$smarty)
+	{
+		$result = self::getSize($params['type']);
+		return $result['width'];
+	}
+	
+	public static function getHeight($params, &$smarty)
+	{
+		$result = self::getSize($params['type']);
+		return $result['height'];
+	}
 
 	/**
 	 * Clear all images in tmp dir

classes/ObjectModel.php

@@ -389,7 +389,7 @@ abstract class ObjectModelCore
 				return (int)$value;
 
 			case self::TYPE_FLOAT :
-				return (float)$value;
+				return (float)str_replace(',', '.', $value);
 
 			case self::TYPE_DATE :
 				if (!$value)

config/smarty.config.inc.php

@@ -80,6 +80,9 @@ smartyRegisterFunction($smarty, 'function', 'displayPrice', array('Tools', 'disp
 smartyRegisterFunction($smarty, 'modifier', 'convertAndFormatPrice', array('Product', 'convertAndFormatPrice')); // used twice
 smartyRegisterFunction($smarty, 'function', 'getAdminToken', array('Tools', 'getAdminTokenLiteSmarty'));
 smartyRegisterFunction($smarty, 'function', 'displayAddressDetail', array('AddressFormat', 'generateAddressSmarty'));
+smartyRegisterFunction($smarty, 'function', 'getWidthSize', array('Image', 'getWidth'));
+smartyRegisterFunction($smarty, 'function', 'getHeightSize', array('Image', 'getHeight'));
+
 
 function smartyDieObject($params, &$smarty)
 {