]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/user_controller.rb
Ensure reports have an issue id and a user id
[rails.git] / app / controllers / user_controller.rb
index 5c41a79dc84da7f336d7ed0152094571c0e0fe8a..0c3ad0b05e31444fee19e1aa82318525da740b34 100644 (file)
@@ -45,9 +45,7 @@ class UserController < ApplicationController
       if current_user
         current_user.terms_seen = true
 
-        if current_user.save
-          flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
-        end
+        flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save
 
         if params[:referer]
           redirect_to params[:referer]
@@ -533,9 +531,7 @@ class UserController < ApplicationController
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
 
-      if email_verified && email == session[:new_user].email
-        session[:new_user].status = "active"
-      end
+      session[:new_user].status = "active" if email_verified && email == session[:new_user].email
 
       redirect_to :action => "terms"
     else