From bdb96ca1b1dbfc1791172fd169d7751cbc4d7d55 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 28 Oct 2014 00:13:31 +0200 Subject: [ci skip] Switch to MIT license; close #3293 --- system/core/Lang.php | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) (limited to 'system/core/Lang.php') diff --git a/system/core/Lang.php b/system/core/Lang.php index 92772acd6..25d0af1ff 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -4,24 +4,35 @@ * * An open source application development framework for PHP 5.2.4 or newer * - * NOTICE OF LICENSE + * This content is released under the MIT License (MIT) * - * Licensed under the Open Software License version 3.0 + * Copyright (c) 2014, British Columbia Institute of Technology * - * This source file is subject to the Open Software License (OSL 3.0) that is - * bundled with this package in the files license.txt / license.rst. It is - * also available through the world wide web at this URL: - * http://opensource.org/licenses/OSL-3.0 - * If you did not receive a copy of the license and are unable to obtain it - * through the world wide web, please send an email to - * licensing@ellislab.com so we can send you a copy immediately. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * @package CodeIgniter - * @author EllisLab Dev Team + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @package CodeIgniter + * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) - * @license http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) - * @link http://codeigniter.com - * @since Version 1.0 + * @copyright Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/) + * @license http://opensource.org/licenses/MIT MIT License + * @link http://codeigniter.com + * @since Version 1.0.0 * @filesource */ defined('BASEPATH') OR exit('No direct script access allowed'); -- cgit v1.2.3-24-g4f1b From 0e924ceed7a71ac343e929270f3e529ecf85f2a5 Mon Sep 17 00:00:00 2001 From: Gabriel Potkány Date: Thu, 6 Nov 2014 11:35:46 +0100 Subject: Ability to pass array of language files to Language Library similar to Loader Library --- system/core/Lang.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'system/core/Lang.php') 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) -- cgit v1.2.3-24-g4f1b From 5a7f77d86ba492fc6561ec9af57fb1135693b357 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 8 Nov 2014 15:15:44 +0200 Subject: Fix #3318 --- system/core/Lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/core/Lang.php') diff --git a/system/core/Lang.php b/system/core/Lang.php index cac73c2e1..bdd6da8e9 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -91,7 +91,7 @@ class CI_Lang { { foreach ($langfile as $value) { - return $this->load($value, $idiom, $return, $add_suffix, $alt_path); + $this->load($value, $idiom, $return, $add_suffix, $alt_path); } } -- cgit v1.2.3-24-g4f1b From 32a077a73e33bc3367db6353d21300259e2cc4d2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 8 Nov 2014 18:52:11 +0200 Subject: Really fix #3318 --- system/core/Lang.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'system/core/Lang.php') diff --git a/system/core/Lang.php b/system/core/Lang.php index bdd6da8e9..c0cd34a3d 100644 --- a/system/core/Lang.php +++ b/system/core/Lang.php @@ -93,6 +93,8 @@ class CI_Lang { { $this->load($value, $idiom, $return, $add_suffix, $alt_path); } + + return; } $langfile = str_replace('.php', '', $langfile); -- cgit v1.2.3-24-g4f1b