github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 06:53:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5 from flarum/analysis-8QMdZm

Browse Source 
Applied fixes from StyleCI
This commit is contained in:
Toby Zerner 2016-02-26 14:26:41 +10:30
commit affe640f03
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/pusher/src/Api/Controller/AuthController.php
View File

@ -38,7 +38,7 @@ class AuthController implements ControllerInterface
*/ */
public function handle(ServerRequestInterface $request) public function handle(ServerRequestInterface $request)
{ {
$userChannel = 'private-user' . $request->getAttribute('actor')->id; $userChannel = 'private-user'.$request->getAttribute('actor')->id;
$body = $request->getParsedBody(); $body = $request->getParsedBody();
if (array_get($body, 'channel_name') === $userChannel) { if (array_get($body, 'channel_name') === $userChannel) {

3
extensions/pusher/src/Listener/AddClientAssets.php
View File

@ -1,4 +1,5 @@
<?php <?php
/* /*
* This file is part of Flarum. * This file is part of Flarum.
* *
@ -38,7 +39,7 @@ class AddClientAssets
if ($event->isAdmin()) { if ($event->isAdmin()) {
$event->addAssets([ $event->addAssets([
__DIR__ . '/../../js/admin/dist/extension.js' __DIR__.'/../../js/admin/dist/extension.js'
]); ]);
$event->addBootstrapper('flarum/pusher/main'); $event->addBootstrapper('flarum/pusher/main');
} }

1
extensions/pusher/src/Listener/AddPusherApi.php
View File

@ -1,4 +1,5 @@
<?php <?php
/* /*
* This file is part of Flarum. * This file is part of Flarum.
* *

3
extensions/pusher/src/Listener/PushNewPosts.php
View File

@ -1,4 +1,5 @@
<?php <?php
/* /*
* This file is part of Flarum. * This file is part of Flarum.
* *
@ -67,7 +68,7 @@ class PushNewPosts
foreach ($event->users as $user) { foreach ($event->users as $user) {
if ($user->shouldAlert($blueprint::getType())) { if ($user->shouldAlert($blueprint::getType())) {
$pusher->trigger('private-user' . $user->id, 'notification', null); $pusher->trigger('private-user'.$user->id, 'notification', null);
} }
} }
} }