diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
commit | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (patch) | |
tree | 0eeb742a553a36bf2375793661ff3e7925f792a6 /system/core/Lang.php | |
parent | 6763522d29416b7db90a6d3c5dceffe1536d8efe (diff) | |
parent | 11fd4b8759438f216318e3e1e004f918b88a56ad (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'system/core/Lang.php')
-rwxr-xr-x | system/core/Lang.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php index 5cb0cad71..73c9127ac 100755 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -65,14 +65,14 @@ class CI_Lang { /** * Load a language file * - * @param mixed the name of the language file to be loaded. Can be an array + * @param mixed the name of the language file to be loaded * @param string the language (english, etc.) * @param bool return loaded array of translations * @param bool add suffix to $langfile * @param string alternative path to look for language file * @return mixed */ - public function load($langfile = '', $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') + public function load($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { $langfile = str_replace('.php', '', $langfile); |