diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-05-31 16:33:22 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-05-31 16:33:22 +0200 |
| commit | 8be0e65ed4c1c4f122a11077ef2a9f91a1d15f98 (patch) | |
| tree | a889b844ced2b84537b662b38bebf0688fb4cf6f /system | |
| parent | f8b6180f37841362d28e78eb25aaf38c55da0839 (diff) | |
| parent | b0ddf7ff878c004af962a721c3d3f672e4a2fa58 (diff) | |
Merge pull request #3072 from ivantcholakov/develop
A fix about loading language files - ensuring suffix '_lang' presence properly.
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Lang.php | 2 |
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'; |