X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6f1aad0d0431703cd834e2b29becf20fcbac4dab..7151fa05e4d4f73956d7f9a7ad2db1f5b956a0c0:/app/controllers/changeset_controller.rb

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 9994a6b1e..322ce79f7 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -167,7 +167,7 @@ class ChangesetController < ApplicationController
       doc.find('//osm/delete/way').each do |nd|
 	elem = XML::Node.new 'way'
 	way = Way.find(nd['id'])
-	way.delete_with_relations_and_history(@user)
+	way.delete_with_history(@user)
 	elem['old_id'] = elem['new_id'] = way.id.to_s
 	elem['new_version'] = way.version.to_s
 	root << elem
@@ -184,5 +184,8 @@ class ChangesetController < ApplicationController
     end
 
     render :text => res.to_s, :content_type => "text/xml"
+
+  rescue OSM::APIError => ex
+    render ex.render_opts
   end
 end