From 8537ad5b4965f49c99a75eb4f2910aef87fbf879 Mon Sep 17 00:00:00 2001 From: alexandergotts <154987484+alexandergotts@users.noreply.github.com> Date: Sat, 17 Feb 2024 22:00:07 +0100 Subject: [PATCH] remove deprecated call to CI_Model::__construct() (#513) In future CI3 version 3.2.0, that constructor is entirely removed, which would result in fatal errors on attempts to call it. See: https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide_src/source/installation/upgrade_320.rst --- application/core/MY_Model.php | 2 -- .../models/Blacklist_number_model.php | 1 - .../server_alert/models/Server_alert_model.php | 1 - .../plugins/sms_credit/models/Sms_credit_model.php | 12 ------------ .../plugins/sms_member/models/Sms_member_model.php | 12 ------------ .../sms_to_email/models/Sms_to_email_model.php | 5 ----- .../sms_to_twitter/models/Sms_to_twitter_model.php | 5 ----- .../plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php | 5 ----- application/plugins/soap/models/Api_model.php | 1 - application/plugins/soap/models/Soap_model.php | 5 ----- .../stop_manager/models/Stop_manager_model.php | 5 ----- .../models/Whitelist_number_model.php | 5 ----- 12 files changed, 59 deletions(-) diff --git a/application/core/MY_Model.php b/application/core/MY_Model.php index 7ca06d816..65584d502 100644 --- a/application/core/MY_Model.php +++ b/application/core/MY_Model.php @@ -23,8 +23,6 @@ class MY_Model extends CI_Model { */ public function __construct() { - parent::__construct(); - set_error_handler(function($errno, $errstr, $errfile, $errline) { throw new ErrorException($errstr, $errno, 0, $errfile, $errline); }); diff --git a/application/plugins/blacklist_number/models/Blacklist_number_model.php b/application/plugins/blacklist_number/models/Blacklist_number_model.php index 8dcb067bc..2d629e986 100644 --- a/application/plugins/blacklist_number/models/Blacklist_number_model.php +++ b/application/plugins/blacklist_number/models/Blacklist_number_model.php @@ -24,7 +24,6 @@ class Blacklist_number_model extends CI_Model { function __construct() { - parent::__construct(); $this->load->helper('kalkun'); } diff --git a/application/plugins/server_alert/models/Server_alert_model.php b/application/plugins/server_alert/models/Server_alert_model.php index dffae5617..0d6b79ba4 100644 --- a/application/plugins/server_alert/models/Server_alert_model.php +++ b/application/plugins/server_alert/models/Server_alert_model.php @@ -24,7 +24,6 @@ class Server_alert_model extends CI_Model { function __construct() { - parent::__construct(); $this->load->helper('kalkun'); } diff --git a/application/plugins/sms_credit/models/Sms_credit_model.php b/application/plugins/sms_credit/models/Sms_credit_model.php index 5cbf6db7a..f6da11d15 100644 --- a/application/plugins/sms_credit/models/Sms_credit_model.php +++ b/application/plugins/sms_credit/models/Sms_credit_model.php @@ -23,18 +23,6 @@ class Sms_credit_model extends CI_Model { - /** - * Constructor - * - * @access public - */ - function __construct() - { - parent::__construct(); - } - - // -------------------------------------------------------------------- - /** * Get Users * diff --git a/application/plugins/sms_member/models/Sms_member_model.php b/application/plugins/sms_member/models/Sms_member_model.php index 7d7abf8b1..82a8730a8 100644 --- a/application/plugins/sms_member/models/Sms_member_model.php +++ b/application/plugins/sms_member/models/Sms_member_model.php @@ -22,18 +22,6 @@ */ class Sms_member_model extends CI_Model { - /** - * Constructor - * - * @access public - */ - function __construct() - { - parent::__construct(); - } - - // -------------------------------------------------------------------- - /** * Get Member * diff --git a/application/plugins/sms_to_email/models/Sms_to_email_model.php b/application/plugins/sms_to_email/models/Sms_to_email_model.php index 6a4a914bc..a094aab96 100644 --- a/application/plugins/sms_to_email/models/Sms_to_email_model.php +++ b/application/plugins/sms_to_email/models/Sms_to_email_model.php @@ -20,11 +20,6 @@ */ class Sms_to_email_model extends CI_Model { - function __construct() - { - parent::__construct(); - } - function get_setting($uid) { $this->db->from('plugin_sms_to_email'); diff --git a/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php b/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php index f506d6a0c..722da24b0 100644 --- a/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php +++ b/application/plugins/sms_to_twitter/models/Sms_to_twitter_model.php @@ -20,11 +20,6 @@ */ class Sms_to_twitter_model extends CI_Model { - function __construct() - { - parent::__construct(); - } - function check_token($uid) { $exist = FALSE; diff --git a/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php b/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php index 70df701ac..34c67bf34 100644 --- a/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php +++ b/application/plugins/sms_to_xmpp/models/Sms_to_xmpp_model.php @@ -20,11 +20,6 @@ */ class Sms_to_xmpp_model extends CI_Model { - function __construct() - { - parent::__construct(); - } - function check_status($uid) { $exist = FALSE; diff --git a/application/plugins/soap/models/Api_model.php b/application/plugins/soap/models/Api_model.php index c1d50084e..f4d1568c6 100644 --- a/application/plugins/soap/models/Api_model.php +++ b/application/plugins/soap/models/Api_model.php @@ -9,7 +9,6 @@ function Plugin_model() { - parent::__construct(); $this->load->library('Remote_Messages'); } diff --git a/application/plugins/soap/models/Soap_model.php b/application/plugins/soap/models/Soap_model.php index d1dd57a8e..0f8a56606 100644 --- a/application/plugins/soap/models/Soap_model.php +++ b/application/plugins/soap/models/Soap_model.php @@ -1,11 +1,6 @@