Fix wrapping in changeset lists properly.

[rails.git] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index f166df21d6075be39651f9350e54106e3f85703b..64eb2180f6d7f0807b1a4aef5987110185a98f0d 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -113,8 +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
+      report_error "#{ex.class}: #{ex.message}", :internal_server_error
     end
   end