diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
| commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
| tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/core/Lang.php | |
| parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
| parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) | |
Merge branch 'working'
Diffstat (limited to 'system/core/Lang.php')
| -rwxr-xr-x | system/core/Lang.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php index 0b926a303..170e6c725 100755 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -51,14 +51,14 @@ class CI_Lang { */ function load($langfile = '', $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { - $langfile = str_replace(EXT, '', $langfile); + $langfile = str_replace('.php', '', $langfile); if ($add_suffix == TRUE) { $langfile = str_replace('_lang.', '', $langfile).'_lang'; } - $langfile .= EXT; + $langfile .= '.php'; if (in_array($langfile, $this->is_loaded, TRUE)) { @@ -129,19 +129,19 @@ class CI_Lang { */ function line($line = '') { - $line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; + $value = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line]; // Because killer robots like unicorns! - if ($line === FALSE) + if ($value === FALSE) { log_message('error', 'Could not find the language line "'.$line.'"'); } - return $line; + return $value; } } // END Language Class /* End of file Lang.php */ -/* Location: ./system/core/Lang.php */
\ No newline at end of file +/* Location: ./system/core/Lang.php */ |