summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-11-07 08:08:00 +0100
committerAndrey Andreev <narf@devilix.net>2014-11-07 08:08:00 +0100
commite9c7b72fa0eb66852cc7b298c057cd36f0f3f0c7 (patch)
tree1865345eb13aa244db169f8376e93f8d939e4444 /system/core
parentda20a575f893f7ff45dc047ba928e233557f70b9 (diff)
parent2d7e05898ee33bee80acdd2aec9ebae8671c5dfc (diff)
Merge pull request #3316 from gadelat/language-array
Ability to pass array of language files to Language Library
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Lang.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 25d0af1ff..cac73c2e1 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -87,6 +87,14 @@ class CI_Lang {
*/
public function load($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '')
{
+ if (is_array($langfile))
+ {
+ foreach ($langfile as $value)
+ {
+ return $this->load($value, $idiom, $return, $add_suffix, $alt_path);
+ }
+ }
+
$langfile = str_replace('.php', '', $langfile);
if ($add_suffix === TRUE)