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

Use RequestUtil to access actor

Browse Source
This commit is contained in:
Alexander Skvortsov 2021-05-12 19:48:17 -04:00
parent d69b3fbb12
commit 706a07429d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/tags/src/Api/Controller/ShowTagController.php
View File

@ -10,6 +10,7 @@
namespace Flarum\Tags\Api\Controller;
use Flarum\Api\Controller\AbstractShowController;
use Flarum\Http\RequestUtil;
use Flarum\Tags\Api\Serializer\TagSerializer;
use Flarum\Tags\Tag;
use Illuminate\Support\Arr;
@ -46,7 +47,7 @@ class ShowTagController extends AbstractShowController
protected function data(ServerRequestInterface $request, Document $document)
{
$slug = Arr::get($request->getQueryParams(), 'slug');
$actor = $request->getAttribute('actor');
$actor = RequestUtil::getActor($request);
$include = $this->extractInclude($request);
return $this->tags

3
extensions/tags/src/Content/Tags.php
View File

@ -11,6 +11,7 @@ namespace Flarum\Tags\Content;
use Flarum\Api\Client;
use Flarum\Frontend\Document;
use Flarum\Http\RequestUtil;
use Flarum\Http\UrlGenerator;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\Tags\Api\Controller\ListTagsController;
@ -79,7 +80,7 @@ class Tags
public function __invoke(Document $document, Request $request)
{
$apiDocument = $this->getTagsDocument($request->getAttribute('actor'));
$apiDocument = $this->getTagsDocument(RequestUtil::getActor($request));
$tags = collect(Arr::get($apiDocument, 'data', []));
$childTags = $tags->where('attributes.isChild', true);