]> source.dussan.org Git - redmine.git/commitdiff
Safer find_by_ call.
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Jan 2013 13:50:51 +0000 (13:50 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Sun, 20 Jan 2013 13:50:51 +0000 (13:50 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11219 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/controllers/account_controller.rb

index 5405b18f4184ee710de397560f5921dfb1583a06..ff2a6adf3fac15ce707ac502278f309d250fa882 100644 (file)
@@ -134,8 +134,8 @@ class AccountController < ApplicationController
 
   # Token based account activation
   def activate
-    redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
-    token = Token.find_by_action_and_value('register', params[:token])
+    redirect_to(home_url) && return unless Setting.self_registration? && params[:token].present?
+    token = Token.find_by_action_and_value('register', params[:token].to_s)
     redirect_to(home_url) && return unless token and !token.expired?
     user = token.user
     redirect_to(home_url) && return unless user.registered?