mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

fix: skip resource eager loading if manually eager loaded

Browse Source
This commit is contained in:
Sami Mazouz
2024-11-23 09:31:38 +01:00
parent 41e5ff2525
commit 464b67f848
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/src/Api/Resource/AbstractDatabaseResource.php
View File

@@ -98,7 +98,9 @@ abstract class AbstractDatabaseResource extends AbstractResource implements
EloquentBuffer::add($model, $relationName, $aggregate); EloquentBuffer::add($model, $relationName, $aggregate);
return function () use ($model, $relationName, $relationship, $field, $context, $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)); return $model->getAttribute($this->property($field));
}; };
@@ -140,7 +142,9 @@ abstract class AbstractDatabaseResource extends AbstractResource implements
EloquentBuffer::add($model, $method); EloquentBuffer::add($model, $method);
return function () use ($model, $method, $field, $context) { 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); $data = $model->getRelation($method);