From c138e2dc5ba679738de4447674f8ba5b392aef03 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 18 Dec 2012 14:40:43 +0100
Subject: [PATCH] [-] BO : fixed weight and distance units validation

---
 classes/Validate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Validate.php b/classes/Validate.php
index a3e564f1b..f939f81cf 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -802,12 +802,12 @@ class ValidateCore
 
 	public static function isWeightUnit($unit)
 	{
-		return preg_match('/^[a-zA-Z]{1,3}$/', $unit);
+		return (Validate::isGenericName($unit) & (Tools::strlen($unit) < 5));
 	}
 
 	public static function isDistanceUnit($unit)
 	{
-		return preg_match('/^[a-zA-Z]{1,2}$/', $unit);
+		return (Validate::isGenericName($unit) & (Tools::strlen($unit) < 5));
 	}
 
 	public static function isSubDomainName($domain)