diff options
author | Root <development@fractureme.com> | 2012-05-26 00:52:59 +0200 |
---|---|---|
committer | Root <development@fractureme.com> | 2012-05-26 00:52:59 +0200 |
commit | 99e602d25051ed449255fe16c4aa0aadd7d05c1f (patch) | |
tree | a0a9d0cdf4e741fcff68a2ecd70c198a43b5d787 /system/core | |
parent | 35ac46d4aad12fe723229feca403b4dee3efcc27 (diff) | |
parent | f33e2ff30b0a9c54d6e8adbe88662838b9bd525e (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'system/core')
-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); |