mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-28 14:06:30 +01: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

6
src/User/Command/RequestPasswordResetHandler.php
View File

@@ -18,9 +18,9 @@ use Flarum\User\UserRepository;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Mail\Message;
use Illuminate\Validation\ValidationException;
class RequestPasswordResetHandler
{
@@ -55,7 +55,7 @@ class RequestPasswordResetHandler
protected $validatorFactory;
/**
* @param \Flarum\User\UserRepository $users
* @param UserRepository $users
* @param SettingsRepositoryInterface $settings
* @param Mailer $mailer
* @param UrlGenerator $url
@@ -106,7 +106,7 @@ class RequestPasswordResetHandler
$token->save();
$data = [
'{username}' => $user->username,
'{username}' => $user->display_name,
'{url}' => $this->url->to('forum')->route('resetPassword', ['token' => $token->id]),
'{forum}' => $this->settings->get('forum_title'),
];