From 24953c5742ffb54fe58b90f05c2f0df8d81ec380 Mon Sep 17 00:00:00 2001 From: nguyenanhung Date: Sat, 14 Sep 2024 14:50:41 +0700 Subject: [PATCH] Fix ORM --- .../HungNG_CI_Base_Custom_Model_Credentials_model.php | 2 +- hungng/HungNG_Custom_Based_model.php | 2 +- hungng/HungNG_Model.php | 2 +- hungng/HungNG_ORM_Model.php | 10 +++------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/custom/HungNG_CI_Base_Custom_Model_Credentials_model.php b/custom/HungNG_CI_Base_Custom_Model_Credentials_model.php index 5d0fd81..85db2b5 100644 --- a/custom/HungNG_CI_Base_Custom_Model_Credentials_model.php +++ b/custom/HungNG_CI_Base_Custom_Model_Credentials_model.php @@ -55,7 +55,7 @@ public function __destruct() $this->db->close(); log_message( 'info', - 'Model "HungNG_CI_Base_Custom_Model_Credentials_model" Class Destructed and database disconnected' + 'Model "HungNG_CI_Base_Custom_Model_Credentials_model" destructed and database disconnected successfully!' ); } } diff --git a/hungng/HungNG_Custom_Based_model.php b/hungng/HungNG_Custom_Based_model.php index 404f2e3..11c6830 100644 --- a/hungng/HungNG_Custom_Based_model.php +++ b/hungng/HungNG_Custom_Based_model.php @@ -165,7 +165,7 @@ public function __destruct() $this->db->close(); log_message( 'info', - 'Class "HungNG_Custom_Based_model" Class Destructed and database disconnected' + 'Model "HungNG_Custom_Based_model" destructed and database disconnected successfully!' ); } } diff --git a/hungng/HungNG_Model.php b/hungng/HungNG_Model.php index b1e2645..f91c28c 100644 --- a/hungng/HungNG_Model.php +++ b/hungng/HungNG_Model.php @@ -215,7 +215,7 @@ public function __destruct() $this->db->close(); log_message( 'info', - 'Class "HungNG_Model" Class Destructed and database disconnected' + 'Model "HungNG_Model" destructed and database disconnected successfully!' ); } } diff --git a/hungng/HungNG_ORM_Model.php b/hungng/HungNG_ORM_Model.php index 21ac4e8..2a50cf4 100644 --- a/hungng/HungNG_ORM_Model.php +++ b/hungng/HungNG_ORM_Model.php @@ -260,7 +260,7 @@ public function __destruct() $this->db->close(); log_message( 'info', - 'Class "HungNG_ORM_Model" Class Destructed and database disconnected' + 'Model "HungNG_ORM_Model" destructed and database disconnected successfully!' ); } } @@ -579,11 +579,7 @@ public function forceFind() */ public static function findOne($condition) { - if ((isset($this))) { - $instance = $this; - } else { - $instance = new static; - } + $instance = new static; $record = $instance->_findByCondition($condition) ->limit(1) @@ -614,7 +610,7 @@ public static function findOne($condition) */ public static function findAll($condition = array(), $limit = null) { - $instance = (isset($this)) ? $this : new static; + $instance = new static; $query = $instance->_findByCondition($condition);