X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dbe165bbb3d6eda37d9579f1ac767599f9055607..51c5be98f7c10e077d22488434365a626da5a893:/app/controllers/changeset_controller.rb diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index d2740f7f3..38effa14c 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -14,7 +14,6 @@ class ChangesetController < ApplicationController before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment] before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed] before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) } - after_action :compress_output around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed] around_action :web_timeout, :only => [:list, :feed, :comments_feed] @@ -255,7 +254,7 @@ class ChangesetController < ApplicationController # list edits (open changesets) in reverse chronological order def list if request.format == :atom && params[:max_id] - redirect_to params.merge(:max_id => nil), :status => :moved_permanently + redirect_to url_for(params.merge(:max_id => nil)), :status => :moved_permanently return end @@ -267,7 +266,7 @@ class ChangesetController < ApplicationController end end - if (params[:friends] || params[:nearby]) && !@user && request.format == :html + if (params[:friends] || params[:nearby]) && !@user require_user return end @@ -443,6 +442,8 @@ class ChangesetController < ApplicationController respond_to do |format| format.rss end + rescue OSM::APIBadUserInput + render :text => "", :status => :bad_request end private