Fix CurrentModel not initialized

novius · Sep 26, 2024 · 10fc17a · 10fc17a
1 parent c8549b7
commit 10fc17a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/resources/views/meta.blade.php b/resources/views/meta.blade.php
@@ -1,7 +1,7 @@
 @php
 /** @var \Illuminate\Database\Eloquent\Model&\Novius\LaravelMeta\Traits\HasMeta|null $model */
 $model = \Novius\LaravelMeta\Facades\CurrentModel::getModel();
-if (!in_array(\Novius\LaravelMeta\Traits\HasMeta::class, class_uses_recursive($model), true)) {
+if ($model === null || !in_array(\Novius\LaravelMeta\Traits\HasMeta::class, class_uses_recursive($model), true)) {
     $model = null;
 }
 @endphp

diff --git a/src/Services/CurrentModelService.php b/src/Services/CurrentModelService.php
@@ -10,7 +10,7 @@
 
 class CurrentModelService
 {
-    public ?Model $model;
+    public ?Model $model = null;
 
     public function setModel(Model $model): void
     {