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

PrestaShop · Jan 21, 2015 · c03ffba · c03ffba
2 parents 79fbebd + 18724f6
commit c03ffba
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/classes/Tools.php b/classes/Tools.php
@@ -1859,6 +1859,9 @@ public static function toUnderscoreCase($string)
 
 	public static function getBrightness($hex)
 	{
+		if (Tools::strtolower($hex) == 'transparent')
+			return '129';
+
 		$hex = str_replace('#', '', $hex);
 		$r = hexdec(substr($hex, 0, 2));
 		$g = hexdec(substr($hex, 2, 2));