mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 10:41:24 +02:00
Code Issues Releases Wiki Activity

Don't load a custom relation if the relation is already loaded

Browse Source
This commit is contained in:
Toby Zerner
2015-09-04 12:22:49 +09:30
parent 0661371180
commit b4acc18b67
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Core/Model.php
View File

@@ -77,7 +77,7 @@ abstract class Model extends Eloquent
// If a custom relation with this key has been set up, then we will load // If a custom relation with this key has been set up, then we will load
// and return results from the query and hydrate the relationship's // and return results from the query and hydrate the relationship's
// value on the "relationships" array. // value on the "relationships" array.
if ($relation = $this->getCustomRelation($key)) { if (! $this->relationLoaded($key) && ($relation = $this->getCustomRelation($key))) {
if (! $relation instanceof Relation) { if (! $relation instanceof Relation) {
throw new LogicException('Relationship method must return an object of type ' throw new LogicException('Relationship method must return an object of type '
. 'Illuminate\Database\Eloquent\Relations\Relation'); . 'Illuminate\Database\Eloquent\Relations\Relation');