| commit | 1e5a9b18f0cbef5092b95378e34ad8e7eaf0c7e7 | [log] [tgz] |
|---|---|---|
| author | Andrey Andreev <narf@devilix.net> | Sat Jan 03 20:25:38 2015 +0200 |
| committer | Andrey Andreev <narf@devilix.net> | Sat Jan 03 20:25:38 2015 +0200 |
| tree | f14411514427a18f3babe074fa9bc6a835dd1e38 | |
| parent | b0357338d3c566f11397010f803189f42d901522 [diff] |
Fix #3453 Allow hyphens and underscores in language idioms.
diff --git a/system/core/Lang.php b/system/core/Lang.php index c0cd34a..9aaf944 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php
@@ -106,7 +106,7 @@ $langfile .= '.php'; - if (empty($idiom) OR ! ctype_alpha($idiom)) + if (empty($idiom) OR ! preg_match('/^[a-z_-]$/i', $idiom)) { $config =& get_config(); $idiom = empty($config['language']) ? 'english' : $config['language'];