From 44b5f1c5f3a94eca96d27e9e2f31efd0fd3a5f6b Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 2 May 2015 08:58:28 +0930
Subject: [PATCH] Make sure serializers work with relations implemented with
 magic (via __call)

---
 framework/core/src/Api/Serializers/BaseSerializer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/core/src/Api/Serializers/BaseSerializer.php b/framework/core/src/Api/Serializers/BaseSerializer.php
index e4db35e62..d79f13b0a 100644
--- a/framework/core/src/Api/Serializers/BaseSerializer.php
+++ b/framework/core/src/Api/Serializers/BaseSerializer.php
@@ -47,7 +47,7 @@ abstract class BaseSerializer extends SerializerAbstract
                 $data = $relation($model, $include);
             } else {
                 if ($include) {
-                    $data = $model->$relation;
+                    $data = !is_null($model->$relation) ? $model->$relation : $model->$relation()->first();
                 } elseif ($many) {
                     $relationIds = $relation.'_ids';
                     $data = $model->$relationIds ?: $model->relation()->get(['id'])->fetch('id')->all();