From 529810a1103a2011af115d1b9a56c58b1b5a4fde Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Wed, 9 Aug 2017 16:38:32 +0200
Subject: [PATCH] News item source

---
 api/app/Http/Controllers/NewsController.php | 2 +-
 common/classes/NewsItem.php                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/app/Http/Controllers/NewsController.php b/api/app/Http/Controllers/NewsController.php
index 68535ec..e422aca 100644
--- a/api/app/Http/Controllers/NewsController.php
+++ b/api/app/Http/Controllers/NewsController.php
@@ -16,7 +16,7 @@ class NewsController extends Controller
 SELECT `news`.`id`, `content`.`title`, `content`.`content`, `news`.`podcast`, `news`.`video`, `news`.`keywords`, `news`.`titlewithdate`, 
        `news`.`creationdt` AS `published`, `content`.`creator`, `content`.`editingdt` AS `edited`, `content`.`editor`, 
        `news`.`startdt` AS `starts`, `news`.`enddt` AS `ends`,
-       `content`.`showsource`, `sources`.`title` AS `source`, `sources`.`url` AS `source_url`, 
+       `content`.`showsource` AS `showsource`, `sources`.`title` AS `source`, `sources`.`url` AS `source_url`, 
        `themes`.`title` AS `theme`, `themes`.`thumbnail` AS `theme_thumbnail`, `regions`.`title` AS `region`
     FROM `news`    
         LEFT JOIN `news_target_content` AS `content` ON `content`.`news` = `news`.`id`
diff --git a/common/classes/NewsItem.php b/common/classes/NewsItem.php
index e7056fc..a008f65 100644
--- a/common/classes/NewsItem.php
+++ b/common/classes/NewsItem.php
@@ -35,11 +35,11 @@ class NewsItem extends Model {
     }
     
     $this->source = null;
-    if($data->source)
+    if(is_object($data->source))
     {
-       $data->source = is_object($data->source) 
-           ? new \Model\NewsSource($data->source->title, $data->source->url, $data->source->url) 
-           : new \Model\NewsSource($data->source, $data->source_url, $data->showsource);
+       $this->source = new \Model\NewsSource($data->source->title, $data->source->url, $data->source->url);
+    } else if($data->source) {
+       $this->source = new \Model\NewsSource($data->source, $data->source_url, $data->showsource);
     }
 
     $this->keywords = null;