karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade to CodeIgniter 2.0.3

Browse Source
This commit is contained in:
Eike Foken
2011-09-13 19:15:50 +02:00
parent 8dd1099e04
commit a8c2551be2
53 changed files with 1949 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
system/core/Lang.php
View File

@@ -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 */
/* Location: ./system/core/Lang.php */