diff --git a/Changelog b/Changelog index d41a3e9da..be7cff2fa 100755 --- a/Changelog +++ b/Changelog @@ -1,4 +1,5 @@ 2018-05-15 DariusIII + * Chg: Change Music category into Audio to match database setting * Fix: Fix links to categories in side menus * Fix: Fix tvSearch query * Chg: Use original subcategory titles when browsing diff --git a/app/Http/Controllers/BrowseController.php b/app/Http/Controllers/BrowseController.php index dc4c02ffb..0cc155693 100644 --- a/app/Http/Controllers/BrowseController.php +++ b/app/Http/Controllers/BrowseController.php @@ -57,7 +57,7 @@ class BrowseController extends BasePageController * @param string $id * @throws \Exception */ - public function show(string $parentCategory, string $id = 'all') + public function show(string $parentCategory, string $id = 'All') { $this->setPrefs(); $releases = new Releases(['Settings' => $this->settings]); @@ -65,7 +65,7 @@ class BrowseController extends BasePageController $parentId = Category::query()->where('title', $parentCategory)->first(['id']); $query = Category::query(); - if ($id !== 'all') { + if ($id !== 'All') { $query->where('title', $id)->where('parentid', $parentId['id']); } else { $query->where('id', $parentId['id']); diff --git a/resources/views/themes/Charisma/basepage.tpl b/resources/views/themes/Charisma/basepage.tpl index 589353018..0fa76cba1 100755 --- a/resources/views/themes/Charisma/basepage.tpl +++ b/resources/views/themes/Charisma/basepage.tpl @@ -91,7 +91,7 @@ class="zmdi zmdi-xbox"> Console