From aa3e24ce3ac17d806af8234305db495832934eb6 Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Mon, 5 Feb 2024 15:03:55 -0500 Subject: [PATCH 1/2] Subsite folder is necessary for the subsite to be appended to the topic url, otherwise it will cause confusion when navigating between listing and individual view when on a subsite --- app/Http/Controllers/ArticleController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ArticleController.php b/app/Http/Controllers/ArticleController.php index 9f6aa401..e09188c3 100644 --- a/app/Http/Controllers/ArticleController.php +++ b/app/Http/Controllers/ArticleController.php @@ -104,7 +104,7 @@ public function show(Request $request): View|Redirector|RedirectResponse $request->data['base']['meta']['image'] = $image['url']; $request->data['base']['meta']['image_alt'] = $image['alt_text']; - $topics = $this->topic->listing($request->data['base']['site']['news']['application_id']); + $topics = $this->topic->listing($request->data['base']['site']['news']['application_id'], $request->data['base']['site']['subsite-folder']); if (!empty($topics['topics']['data'])) { $topics['topics']['data'] = $this->topic->setSelected($topics['topics']['data'], $request->slug); From d3773fdbc37b17090e2ebd7654323fdc6afaf65a Mon Sep 17 00:00:00 2001 From: Chris Pelzer Date: Mon, 5 Feb 2024 15:04:41 -0500 Subject: [PATCH 2/2] version bump to 8.8.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 14bd68cd..ee64abc0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "base", "private": true, - "version": "8.8.0", + "version": "8.8.1", "description": "", "scripts": { "dev": "npm run development",