From 7e5a685ed31b65ddd75196d4616ab142c39af8d9 Mon Sep 17 00:00:00 2001 From: xue <> Date: Wed, 12 Mar 2008 18:01:41 +0000 Subject: fixed #754. --- framework/I18N/core/CultureInfo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'framework/I18N') diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php index 15370ebe..41b3bf45 100644 --- a/framework/I18N/core/CultureInfo.php +++ b/framework/I18N/core/CultureInfo.php @@ -220,7 +220,7 @@ class CultureInfo */ public function validCulture($culture) { - if(preg_match('/^[a-z]{2}(_[A-Z]{2,5}){0,2}$/', $culture)) + if(preg_match('/^[_\\w]+$/', $culture)) return is_file(self::dataDir().$culture.self::fileExt()); return false; @@ -235,7 +235,7 @@ class CultureInfo { if(!empty($culture)) { - if (!preg_match('/^[a-z]{2}(_[A-Z]{2,5}){0,2}$/', $culture)) + if (!preg_match('/^[_\\w]+$/', $culture)) throw new Exception('Invalid culture supplied: ' . $culture); } -- cgit v1.2.3