small changes

esyede · Jul 7, 2023 · 174c4ba · 174c4ba
1 parent 46f1726
commit 174c4ba
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/system/database/facile/query.php b/system/database/facile/query.php
@@ -108,6 +108,11 @@ public function paginate($perpage = null, array $columns = ['*'])
         $perpage = $perpage ?: $this->model->perpage();
         $paginator = $this->table->paginate($perpage, $columns);
         $paginator->results = $this->hydrate($this->model, $paginator->results);
+        $paginator->results = array_map(function ($result) {
+            return (($result instanceof Model) && property_exists($result, 'attributes'))
+                ? (object) $result->attributes
+                : $result;
+        }, $paginator->results);
 
         return $paginator;
     }
@@ -128,7 +133,7 @@ public function hydrate($model, array $results)
         foreach ($results as $result) {
             $model = new $model([], true);
             $model->fill_raw((array) $result);
-            $models[] = (object) $model->attributes;
+            $models[] = $model;
         }
 
         if (count($results) > 0) {