X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/97769170fde23c0bd113cff47cbd2977c727d180..d2f2dc17781a75d6aff250e5e9fa623d711fc25f:/app/controllers/application.rb diff --git a/app/controllers/application.rb b/app/controllers/application.rb index 2f8bd776d..64eb2180f 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -113,10 +113,9 @@ class ApplicationController < ActionController::Base ex.record.errors.each { |attr,msg| message << "#{attr}: #{msg} (#{ex.record[attr].inspect})" } report_error message, :bad_request rescue OSM::APIError => ex - render_opts = ex.render_opts - report_error render_opts[:text], render_opts[:status] + report_error ex.message, ex.status rescue Exception => ex - render :text => "#{ex.class}: #{ex.message}", :status => :internal_server_error + report_error "#{ex.class}: #{ex.message}", :internal_server_error end end