summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-05-31 19:40:02 +0200
committerAndrey Andreev <narf@devilix.net>2014-05-31 19:40:02 +0200
commit657c43c142eb91f104fc86225309a8c3ebe3df12 (patch)
tree7ae096b3a3c64c3dc1a454c5175529d9e7bbb51a /system/core
parent47a47fb9fafdb26206d01d846d8013f6e883eb37 (diff)
parent632bb4a595714b6d14d02f80933dd7859f6fa90d (diff)
Merge branch 'develop' into feature/session
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 ae0a4d642..92772acd6 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -80,7 +80,7 @@ class CI_Lang {
if ($add_suffix === TRUE)
{
- $langfile = str_replace('_lang', '', $langfile).'_lang';
+ $langfile = preg_replace('/_lang$/', '', $langfile).'_lang';
}
$langfile .= '.php';