fix: skip resource eager loading if manually eager loaded

flarum · Nov 23, 2024 · 464b67f · 464b67f
1 parent 41e5ff2
commit 464b67f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/framework/core/src/Api/Resource/AbstractDatabaseResource.php b/framework/core/src/Api/Resource/AbstractDatabaseResource.php
@@ -98,7 +98,9 @@ protected function getAttributeValue(Model $model, Field $field, Context $contex
             EloquentBuffer::add($model, $relationName, $aggregate);
 
             return function () use ($model, $relationName, $relationship, $field, $context, $aggregate) {
-                EloquentBuffer::load($model, $relationName, $relationship, $context, $aggregate);
+                if (! $model->hasAttribute($this->property($field))) {
+                    EloquentBuffer::load($model, $relationName, $relationship, $context, $aggregate);
+                }
 
                 return $model->getAttribute($this->property($field));
             };
@@ -140,7 +142,9 @@ protected function getRelationshipValue(Model $model, Relationship $field, Conte
             EloquentBuffer::add($model, $method);
 
             return function () use ($model, $method, $field, $context) {
-                EloquentBuffer::load($model, $method, $field, $context);
+                if (! $model->relationLoaded($method)) {
+                    EloquentBuffer::load($model, $method, $field, $context);
+                }
 
                 $data = $model->getRelation($method);