mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-11 15:04:25 +02:00
Code Issues Releases Wiki Activity

Combine URL generator classes into one

Browse Source
This commit is contained in:
Franz Liedke
2017-06-25 23:33:02 +02:00
parent f824dcfb53
commit b72407440d
19 changed files with 104 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forum/Controller/DiscussionController.php
View File

@@ -13,8 +13,8 @@ namespace Flarum\Forum\Controller;
use Flarum\Api\Client;
use Flarum\Forum\Frontend;
use Flarum\Forum\UrlGenerator;
use Flarum\Http\Exception\RouteNotFoundException;
use Flarum\Http\UrlGenerator;
use Flarum\User\User;
use Illuminate\Contracts\Events\Dispatcher;
use Psr\Http\Message\ServerRequestInterface as Request;
@@ -73,7 +73,7 @@ class DiscussionController extends FrontendController
$newQueryParams = array_merge($queryParams, $newQueryParams);
$queryString = http_build_query($newQueryParams);
return $this->url->toRoute('discussion', ['id' => $document->data->id]).
return $this->url->to('forum')->route('discussion', ['id' => $document->data->id]).
($queryString ? '?'.$queryString : '');
};