Revert model coalesce

codeigniter4 · Jun 10, 2021 · f494f77 · f494f77
1 parent 4f42d4b
commit f494f77
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/system/Model.php b/system/Model.php
@@ -707,7 +707,17 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
      */
     public function __get(string $name)
     {
-        return parent::__get($name) ?? $this->builder()->$name ?? null;
+         if (parent::__isset($name))
+         {
+             return parent::__get($name);
+         }
+
+         if (isset($this->builder()->$name))
+         {
+             return $this->builder()->$name;
+         }
+
+         return null;
     }
 
     /**