From 1c77aabf1aa0e860a3dc739d702dc8ff8dbdc907 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 8 Oct 2014 00:35:29 +0300
Subject: #3253

---
 system/core/Loader.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/core/Loader.php')

diff --git a/system/core/Loader.php b/system/core/Loader.php
index c884df1cf..248245387 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -290,8 +290,8 @@ class CI_Loader {
 
 			require_once($mod_path.'models/'.$path.$model.'.php');
 
-			$CI->$name = new $model();
 			$this->_ci_models[] = $name;
+			$CI->$name = new $model();
 			return $this;
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From bdb96ca1b1dbfc1791172fd169d7751cbc4d7d55 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 28 Oct 2014 00:13:31 +0200
Subject: [ci skip] Switch to MIT license; close #3293

---
 system/core/Loader.php | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'system/core/Loader.php')

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 248245387..5b119854b 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.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 d8e31ec82d4f25378d6032df81fc5e9af5de5738 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 7 Nov 2014 12:17:50 +0200
Subject: Simplify CI_Loader::lang() following #3316

---
 system/core/Loader.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'system/core/Loader.php')

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 5b119854b..e0a7d5e1b 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -634,14 +634,7 @@ class CI_Loader {
 	 */
 	public function language($files, $lang = '')
 	{
-		$LNG =& get_instance()->lang;
-		is_array($files) OR $files = array($files);
-
-		foreach ($files as $langfile)
-		{
-			$LNG->load($langfile, $lang);
-		}
-
+		get_instance()->lang->load($files, $lang);
 		return $this;
 	}
 
-- 
cgit v1.2.3-24-g4f1b