github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-29 04:33:47 +08:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fixes log in without remember on master (#1402)

Browse Source 
* fixes log in without remember on master

* Fix cookie name by removing prefix from session name rather than in CookieFactory

* Inline temp variable
This commit is contained in:
Daniël Klabbers 2018-04-11 23:19:34 +02:00 committed by Toby Zerner
parent f51e29ff4c
commit 043aa0f2d9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Http/Middleware/StartSession.php
View File

@ -40,7 +40,9 @@ class StartSession implements MiddlewareInterface
protected $config; protected $config;
/** /**
* @param SessionHandlerInterface $handler
* @param CookieFactory $cookie * @param CookieFactory $cookie
* @param ConfigRepository $config
*/ */
public function __construct(SessionHandlerInterface $handler, CookieFactory $cookie, ConfigRepository $config) public function __construct(SessionHandlerInterface $handler, CookieFactory $cookie, ConfigRepository $config)
{ {
@ -67,12 +69,10 @@ class StartSession implements MiddlewareInterface
private function makeSession(Request $request) private function makeSession(Request $request)
{ {
$cookieName = $this->cookie->getName($this->config['cookie']);
return new Store( return new Store(
$cookieName, $this->config['cookie'],
$this->handler, $this->handler,
array_get($request->getCookieParams(), $cookieName) array_get($request->getCookieParams(), $this->cookie->getName($this->config['cookie']))
); );
} }