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

Merge branch 'master' into 1236-database-changes

Browse Source 
# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php
This commit is contained in:
Toby Zerner
2018-07-21 21:37:49 +09:30
parent d42f33971a c562302161
commit 677a7dd2d3
101 changed files with 3073 additions and 2272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Api/Controller/SetSettingsController.php
View File

@@ -11,8 +11,7 @@
namespace Flarum\Api\Controller;
use Flarum\Settings\Event\Saved;
use Flarum\Settings\Event\Serializing;
use Flarum\Settings\Event;
use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\AssertPermissionTrait;
use Illuminate\Contracts\Events\Dispatcher;
@@ -53,14 +52,16 @@ class SetSettingsController implements RequestHandlerInterface
$settings = $request->getParsedBody();
$this->dispatcher->dispatch(new Event\Saving($settings));
foreach ($settings as $k => $v) {
$this->dispatcher->dispatch(new Serializing($k, $v));
$this->dispatcher->dispatch(new Event\Serializing($k, $v));
$this->settings->set($k, $v);
$this->dispatcher->dispatch(new Saved($k, $v));
}
$this->dispatcher->dispatch(new Event\Saved($settings));
return new EmptyResponse(204);
}
}

3
src/Api/Serializer/PostSerializer.php
View File

@@ -66,7 +66,8 @@ class PostSerializer extends BasicPostSerializer
$attributes += [
'canEdit' => $canEdit,
'canDelete' => $gate->allows('delete', $post)
'canDelete' => $gate->allows('delete', $post),
'canHide' => $gate->allows('hide', $post)
];
return $attributes;