summaryrefslogtreecommitdiff
path: root/framework/I18N/core
diff options
context:
space:
mode:
authorChristophe.Boulain <>2009-06-02 08:16:54 +0000
committerChristophe.Boulain <>2009-06-02 08:16:54 +0000
commit0847a5cb9bc02872e472622e1eec56896a412078 (patch)
tree0f43a88df53333f01e06e1f214c31a77f412e1c0 /framework/I18N/core
parent0ce86cec9911151088341846dd2677bfed2ff51e (diff)
parent8e0cb0ff0a89603740c7a46a43c87a6d3267ca6f (diff)
Merging latest 3.1 changes into trunk
Diffstat (limited to 'framework/I18N/core')
-rw-r--r--framework/I18N/core/CultureInfo.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/I18N/core/CultureInfo.php b/framework/I18N/core/CultureInfo.php
index 7ee50bba..18aae74d 100644
--- a/framework/I18N/core/CultureInfo.php
+++ b/framework/I18N/core/CultureInfo.php
@@ -218,7 +218,7 @@ class CultureInfo
* @param string a culture
* @return boolean true if valid, false otherwise.
*/
- public function validCulture($culture)
+ public static function validCulture($culture)
{
if(preg_match('/^[_\\w]+$/', $culture))
return is_file(self::dataDir().$culture.self::fileExt());