mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-23 09:41:26 +02:00
Code Issues Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Franz Liedke
2015-06-17 01:27:44 +02:00
parent b931ba1227
commit 26afeced69
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/core/src/Api/Actions/Forum/ShowAction.php
View File

@@ -1,9 +1,8 @@
<?php namespace Flarum\Api\Actions\Forum; <?php namespace Flarum\Api\Actions\Forum;
use Flarum\Core\Models\Forum;
use Flarum\Api\Actions\SerializeResourceAction; use Flarum\Api\Actions\SerializeResourceAction;
use Flarum\Api\JsonApiRequest; use Flarum\Api\JsonApiRequest;
use Flarum\Api\JsonApiResponse; use Tobscure\JsonApi\Document;
class ShowAction extends SerializeResourceAction class ShowAction extends SerializeResourceAction
{ {
@@ -19,10 +18,10 @@ class ShowAction extends SerializeResourceAction
* response. * response.
* *
* @param \Flarum\Api\JsonApiRequest $request * @param \Flarum\Api\JsonApiRequest $request
* @param \Flarum\Api\JsonApiResponse $response * @param \Tobscure\JsonApi\Document $document
* @return \Flarum\Core\Models\Forum * @return array
*/ */
protected function data(JsonApiRequest $request, JsonApiResponse $response) protected function data(JsonApiRequest $request, Document $document)
{ {
return app('flarum.forum'); return app('flarum.forum');
} }