From c9420849853a33a192c482e28c737e166d4fa698 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 10 Nov 2017 15:12:04 +0200 Subject: Close #5330 --- system/core/Model.php | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'system/core/Model.php') diff --git a/system/core/Model.php b/system/core/Model.php index c809e7b84..691053a9c 100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -48,18 +48,6 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ class CI_Model { - /** - * Class constructor - * - * @return void - */ - public function __construct() - { - log_message('info', 'Model Class Initialized'); - } - - // -------------------------------------------------------------------- - /** * __get magic * -- cgit v1.2.3-24-g4f1b From ee8324368f2844aae0d558f1d194419a2181c281 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Wed, 15 Nov 2017 14:35:09 +0200 Subject: Partially revert c9420849853a33a192c482e28c737e166d4fa698; close #5332 --- system/core/Model.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'system/core/Model.php') diff --git a/system/core/Model.php b/system/core/Model.php index 691053a9c..8bff9cf91 100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -48,6 +48,14 @@ defined('BASEPATH') OR exit('No direct script access allowed'); */ class CI_Model { + /** + * Class constructor + * + * @link https://github.com/bcit-ci/CodeIgniter/issues/5332 + * @return void + */ + public function __construct() {} + /** * __get magic * -- cgit v1.2.3-24-g4f1b From cce6bd170f24cf0f10ca0b58150d0324433a66be Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 9 Jan 2018 11:32:02 +0200 Subject: [ci skip] Merge pull request #5376 from jim-parry/copyright-update Annual copyright update Conflicts resolved: system/libraries/Cache/drivers/Cache_apcu.php --- system/core/Model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'system/core/Model.php') diff --git a/system/core/Model.php b/system/core/Model.php index 8bff9cf91..dd11dd20c 100644 --- a/system/core/Model.php +++ b/system/core/Model.php @@ -6,7 +6,7 @@ * * This content is released under the MIT License (MIT) * - * Copyright (c) 2014 - 2017, British Columbia Institute of Technology + * Copyright (c) 2014 - 2018, British Columbia Institute of Technology * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -29,7 +29,7 @@ * @package CodeIgniter * @author EllisLab Dev Team * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/) - * @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/) + * @copyright Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/) * @license http://opensource.org/licenses/MIT MIT License * @link https://codeigniter.com * @since Version 1.0.0 -- cgit v1.2.3-24-g4f1b