github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 23:48:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don't use flash cause we are not redirecting

Browse Source 
(we should probably change that though)
This commit is contained in:
Sam
2015-02-20 10:28:38 +11:00
parent 61bd9c77c3
commit 17927b2e8b
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/users_controller.rb
View File

@ -281,7 +281,7 @@ class UsersController < ApplicationController
end
def password_reset
expires_now()
expires_now
if EmailToken.valid_token_format?(params[:token])
@user = EmailToken.confirm(params[:token])
@ -297,7 +297,7 @@ class UsersController < ApplicationController
end
if !@user
flash[:error] = I18n.t('password_reset.no_token')
@error = I18n.t('password_reset.no_token')
elsif request.put?
@invalid_password = params[:password].blank? || params[:password].length > User.max_password_length
@ -325,7 +325,7 @@ class UsersController < ApplicationController
'password_reset.success_unapproved'
end
flash[:success] = I18n.t(message)
@success = I18n.t(message)
end
def change_email