summaryrefslogtreecommitdiffstats
path: root/system/core/Lang.php
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-04-27 15:58:11 +0200
committerTimothy Warren <tim@timshomepage.net>2012-04-27 15:58:11 +0200
commit7183ff91112e540315dffdef2cea0d6d491cdc2e (patch)
tree71119fbf7069a35abf1e1ad8eaa6e49ba16afecb /system/core/Lang.php
parentb82bc3a016ce01dfeb993da5918853625a40af86 (diff)
parent8a6d16c62602d249d2e66356faf5e2f4b8470c9e (diff)
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into library-cleanup
Diffstat (limited to 'system/core/Lang.php')
-rwxr-xr-xsystem/core/Lang.php26
1 files changed, 15 insertions, 11 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 2963012fc..5cb0cad71 100755
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -42,7 +42,7 @@ class CI_Lang {
* @var array
*/
public $language = array();
-
+
/**
* List of loaded language files
*
@@ -52,6 +52,8 @@ class CI_Lang {
/**
* Initialize language class
+ *
+ * @return void
*/
public function __construct()
{
@@ -76,22 +78,20 @@ class CI_Lang {
if ($add_suffix == TRUE)
{
- $langfile = str_replace('_lang.', '', $langfile).'_lang';
+ $langfile = str_replace('_lang', '', $langfile).'_lang';
}
$langfile .= '.php';
- if (in_array($langfile, $this->is_loaded, TRUE))
+ if ($idiom == '')
{
- return;
+ $config =& get_config();
+ $idiom = ( ! empty($config['language'])) ? $config['language'] : 'english';
}
- $config =& get_config();
-
- if ($idiom == '')
+ if ($return == FALSE && isset($this->is_loaded[$langfile]) && $this->is_loaded[$langfile] === $idiom)
{
- $deft_lang = ( ! isset($config['language'])) ? 'english' : $config['language'];
- $idiom = ($deft_lang == '') ? 'english' : $deft_lang;
+ return;
}
// Determine where the language file is and load it
@@ -123,6 +123,11 @@ class CI_Lang {
if ( ! isset($lang) OR ! is_array($lang))
{
log_message('error', 'Language file contains no data: language/'.$idiom.'/'.$langfile);
+
+ if ($return == TRUE)
+ {
+ return array();
+ }
return;
}
@@ -131,9 +136,8 @@ class CI_Lang {
return $lang;
}
- $this->is_loaded[] = $langfile;
+ $this->is_loaded[$langfile] = $idiom;
$this->language = array_merge($this->language, $lang);
- unset($lang);
log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
return TRUE;