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

Properly wrap error bag in session

Browse Source 
Second part of fixing #1683.
This commit is contained in:
Franz Liedke 2019-02-03 21:16:43 +01:00
parent e4a913db95
commit 233b495ff8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Forum/Controller/SavePasswordController.php
View File

@ -18,6 +18,7 @@ use Flarum\User\PasswordToken;
use Flarum\User\UserValidator; use Flarum\User\UserValidator;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Validation\Factory; use Illuminate\Contracts\Validation\Factory;
use Illuminate\Support\MessageBag;
use Illuminate\Validation\ValidationException; use Illuminate\Validation\ValidationException;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
@ -86,7 +87,7 @@ class SavePasswordController implements RequestHandlerInterface
throw new ValidationException($validator); throw new ValidationException($validator);
} }
} catch (ValidationException $e) { } catch (ValidationException $e) {
$request->getAttribute('session')->put('errors', $e->errors()); $request->getAttribute('session')->put('errors', new MessageBag($e->errors()));
return new RedirectResponse($this->url->to('forum')->route('resetPassword', ['token' => $token->token])); return new RedirectResponse($this->url->to('forum')->route('resetPassword', ['token' => $token->token]));
} }