diff --git a/Changelog b/Changelog index f8a9dea58..f5dd8bbfb 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2019-04-21 DariusIII + * Fix: Fix error related to $user variable in RssController * Chg: Update used libraries to latest versions 2019-04-18 DariusIII * Chg: Update laravel/framework and nesbot/carbon to latest versions diff --git a/app/Http/Controllers/RssController.php b/app/Http/Controllers/RssController.php index 7701eee66..944302640 100644 --- a/app/Http/Controllers/RssController.php +++ b/app/Http/Controllers/RssController.php @@ -24,7 +24,7 @@ class RssController extends BasePageController $user = $this->userCheck($request); - if (is_it_json($user)) { + if (is_object($user)) { return $user; } @@ -48,7 +48,7 @@ class RssController extends BasePageController $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); - if (is_it_json($user)) { + if (is_object($user)) { return $user; } $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; @@ -70,7 +70,7 @@ class RssController extends BasePageController $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); - if (is_it_json($user)) { + if (is_object($user)) { return $user; } $userAirDate = $request->has('airdate') && is_numeric($request->input('airdate')) ? abs($request->input('airdate')) : -1; @@ -141,7 +141,7 @@ class RssController extends BasePageController $rss = new RSS(['Settings' => $this->settings]); $offset = 0; $user = $this->userCheck($request); - if (is_it_json($user)) { + if (is_object($user)) { return $user; } $outputXML = (! ($request->has('o') && $request->input('o') === 'json')); @@ -175,7 +175,7 @@ class RssController extends BasePageController } $user = $this->userCheck($request); - if (is_it_json($user)) { + if (is_object($user)) { return $user; } $categoryId = explode(',', $request->input('id'));