github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 12:55:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Discussion HTML: Fix generation of next/prev URLs

Browse Source
This commit is contained in:
Franz Liedke 2018-07-16 01:42:36 +02:00
parent 05f73d8a1e
commit 2ffcb4eec6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Forum/Content/Discussion.php
View File

@ -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 : '');
};