X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b7b68aee36b19700aa95a3ea613bede6a841f7ee..3c22a53c931c8f55cea820a0bc3604311aa45100:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 321b61918..b96b66464 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -12,14 +12,12 @@ class UserController < ApplicationController before_filter :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files] before_filter :require_allow_read_prefs, :only => [:api_details] before_filter :require_allow_read_gpx, :only => [:api_gpx_files] - before_filter :require_cookies, :only => [:login, :confirm] + before_filter :require_cookies, :only => [:new, :login, :confirm] before_filter :require_administrator, :only => [:set_status, :delete, :list] around_filter :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files] before_filter :lookup_user_by_id, :only => [:api_read] before_filter :lookup_user_by_name, :only => [:set_status, :delete] - cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete] - def terms @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE @text = OSM.legal_text_for_country(@legale) @@ -395,7 +393,7 @@ class UserController < ApplicationController end def api_read - render :nothing => true, :status => :gone unless @this_user.visible? + render :text => "", :status => :gone unless @this_user.visible? end def api_details