Merge pull request #1089 from budnik/minor_refactorings

Some refactorings
2025-05-22 16:21:18 +08:00 · 2013-06-25 17:29:51 -07:00
parent 3af12ba7d3 2722029d38
commit 4b56aa8183
2 changed files with 12 additions and 27 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -306,7 +306,7 @@ class UsersController < ApplicationController
    @user = fetch_user_from_params
    @email_token = @user.email_tokens.unconfirmed.active.first
    if @user
-      @email_token = @user.email_tokens.create(email: @user.email) if @email_token.nil?
+      @email_token ||= @user.email_tokens.create(email: @user.email)
      Jobs.enqueue(:user_email, type: :signup, user_id: @user.id, email_token: @email_token.token)
    end
    render nothing: true