Merge conflict gefixt
This commit is contained in:
@@ -51,20 +51,6 @@ QUERY;
|
|||||||
return response($view)->header('Content-Type', 'application/xml');
|
return response($view)->header('Content-Type', 'application/xml');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* RSS-feed van alle podcasts
|
|
||||||
*/
|
|
||||||
public function rss(Request $request) {
|
|
||||||
$page = (int)$request->get('page', 1);
|
|
||||||
if($page <= 0) {
|
|
||||||
return abort(400);
|
|
||||||
}
|
|
||||||
|
|
||||||
$podcasts = $this->retrieveNewsItems($page, $count = 20, $filter = null, $params = []);
|
|
||||||
$view = view('rss.news')->with('news', $podcasts)->with('url', $request->url())->with('page', $page);
|
|
||||||
return response($view)->header('Content-Type', 'application/xml');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lijst van alle nieuwsberichten
|
* Lijst van alle nieuwsberichten
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user