mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-25 18:51:40 +02:00
Code Issues Releases Wiki Activity

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,9 @@ class LogInController implements ControllerInterface
event(new LoggedIn($this->users->findOrFail($data->userId), $token));
$response = $this->rememberer->remember($response, $token, ! array_get($body, 'remember'));
if (array_get($body, 'remember')) {
$response = $this->rememberer->remember($response, $token);
}
}
return $response;