Fixing a bug that prevented eager loads from working on hasOne and be…

…longsTo relationships.
kimmelsg · Jun 30, 2016 · 7b4fc08 · 7b4fc08
1 parent 3dffdf1
commit 7b4fc08
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/Traits/QueryHelperTrait.php b/src/Traits/QueryHelperTrait.php
@@ -19,16 +19,14 @@ protected function eagerLoadIncludes($model, $includes)
         $builder = $model;
 
         foreach ($includes as $include) {
-            if (!$model->$include) {
-                continue;
+            if (method_exists($model, $include) && $model->$include() instanceof Relation) {
+                $builder = $builder->with([
+                    $include => function ($query) use ($include) {
+                        $parameters = $this->fractal ? $this->fractal->getIncludeParams($include) : null;
+                        $this->applyParameters($query, $parameters);
+                    }
+                ]);
             }
-
-            $builder = $builder->with([
-                $include => function ($query) use ($include) {
-                    $parameters = $this->fractal ? $this->fractal->getIncludeParams($include) : null;
-                    $this->applyParameters($query, $parameters);
-                }
-            ]);
         }
 
         return $builder;