summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-03 19:25:38 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-03 19:25:38 +0100
commit1e5a9b18f0cbef5092b95378e34ad8e7eaf0c7e7 (patch)
treef14411514427a18f3babe074fa9bc6a835dd1e38 /system/core
parentb0357338d3c566f11397010f803189f42d901522 (diff)
Fix #3453
Allow hyphens and underscores in language idioms.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Lang.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php
index c0cd34a3d..9aaf944ce 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -106,7 +106,7 @@ class CI_Lang {
$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'];