NH_Gooi/api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

News item source

Browse Source
This commit is contained in:
Mischa Spelt
2017-08-09 16:38:32 +02:00
parent da44b6bf3a
commit 529810a110
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/app/Http/Controllers/NewsController.php
View File

@@ -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`

8
common/classes/NewsItem.php
View File

@@ -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;