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

2013-04-29 16:21:51 +02:00
parent acccaf5fbc dc7f1ceddf
commit 716b79b8c6
12 changed files with 42 additions and 20 deletions
@@ -1055,6 +1055,9 @@ class ValidateCore
 	{
 		return (bool)(is_string($name) && preg_match('/^[0-9a-zA-Z-_]*$/u', $name));
 	}
-
-}
-
+	
+	public static function isPrestaShopVersion($version)
+	{
+		return (preg_match('/^[0-1]\.[0-9]{1,2}(\.[0-9]{1,2}){0,2}$/', $version) && ip2long($version));
+	}
+}