github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-03 05:39:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: bust broken password

Browse Source
This commit is contained in:
Sam 2013-11-11 22:28:26 +11:00
parent e5fd2946e0
commit 3473734af0
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/users_controller.rb
View File

@ -156,18 +156,14 @@ class UsersController < ApplicationController
@user = EmailToken.confirm(params[:token]) @user = EmailToken.confirm(params[:token])
if @user.blank? if @user.blank?
flash[:error] = I18n.t('password_reset.no_token') flash[:error] = I18n.t('password_reset.no_token')
else elsif request.put?
raise Discourse::InvalidParameters.new(:password) unless good_reset_request_format raise Discourse::InvalidParameters.new(:password) unless params[:password].present?
@user.password = params[:password] @user.password = params[:password]
logon_after_password_reset if @user.save logon_after_password_reset if @user.save
end end
render layout: 'no_js' render layout: 'no_js'
end end
def good_reset_request_format
request.put? && params[:password].present?
end
def logon_after_password_reset def logon_after_password_reset
message = if Guardian.new(@user).can_access_forum? message = if Guardian.new(@user).can_access_forum?
# Log in the user # Log in the user