From 3d845d573052cbc3047b6e35a606a6e5b378714c Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Mon, 16 Jul 2018 01:42:36 +0200 Subject: [PATCH] Discussion HTML: Fix generation of next/prev URLs --- src/Forum/Content/Discussion.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Forum/Content/Discussion.php b/src/Forum/Content/Discussion.php index 9520a7b31..0000a6027 100644 --- a/src/Forum/Content/Discussion.php +++ b/src/Forum/Content/Discussion.php @@ -73,9 +73,11 @@ class Discussion implements ContentInterface $url = function ($newQueryParams) use ($queryParams, $apiDocument) { $newQueryParams = array_merge($queryParams, $newQueryParams); + unset($newQueryParams['id']); $queryString = http_build_query($newQueryParams); - return $this->url->to('forum')->route('discussion', ['id' => $apiDocument->data->id]). + $idWithSlug = $apiDocument->data->id . (trim($apiDocument->data->attributes->slug) ? '-' . $apiDocument->data->attributes->slug : ''); + return $this->url->to('forum')->route('discussion', ['id' => $idWithSlug]). ($queryString ? '?'.$queryString : ''); };