Merge pull request #5 from avenirer/version-3.0

225

Author: salain

core/MY_Model.php

@@ -612,14 +612,6 @@ public function update($data = NULL, $column_name_where = NULL, $escape = TRUE)
      */
     public function where($field_or_array = NULL, $operator_or_value = NULL, $value = NULL, $with_or = FALSE, $with_not = FALSE, $custom_string = FALSE)
     {
-        if($this->soft_deletes===TRUE)
-        {
-            $backtrace = debug_backtrace(); #fix for lower PHP 5.4 version
-            if($backtrace[1]['function']!='force_delete'){
-                $this->_where_trashed();
-            }
-        }
-
         if(is_array($field_or_array))
         {
             $multi = $this->is_multidimensional($field_or_array);
@@ -936,7 +928,7 @@ public function get($where = NULL)
             {
                 $this->where($where);
             }
-            elseif($this->soft_deletes===TRUE)
+            if($this->soft_deletes===TRUE)
             {
                 $this->_where_trashed();
             }
@@ -984,7 +976,7 @@ public function get_all($where = NULL)
             {
                 $this->where($where);
             }
-            elseif($this->soft_deletes===TRUE)
+            if($this->soft_deletes===TRUE)
             {
                 $this->_where_trashed();
             }
@@ -1035,7 +1027,7 @@ public function count_rows($where = NULL)
         {
             $this->where($where);
         }
-        elseif($this->soft_deletes===TRUE)
+        if($this->soft_deletes===TRUE)
         {
             $this->_where_trashed();
         }