X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a99b5169626d3369886c471e846020fbff301dbc..047027c95d8e886a653229ff69c303e81590b30f:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 01e62ccc3..93ca03d66 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -24,7 +24,7 @@ class UserController < ApplicationController if request.xhr? render :update do |page| - page.replace_html "contributorTerms", :partial => "terms" + page.replace_html "contributorTerms", :partial => "terms", :locals => { :has_decline => params[:has_decline] } end else @title = t 'user.terms.title' @@ -206,7 +206,7 @@ class UserController < ApplicationController # them to that unless they've also got a block on them, in # which case redirect them to the block so they can clear it. if user.blocked_on_view - redirect_to user.blocked_on_view, :referrer => params[:referrer] + redirect_to user.blocked_on_view, :referer => params[:referer] elsif params[:referer] redirect_to params[:referer] else