X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fb5f39f19ae00dad9ec896e216e8e813de42c151..70ecb3ceefbbc84267bbb8cdbeec3e2f7ad861c3:/app/controllers/way_controller.rb diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb index e7cf0f7f1..b00658cf0 100644 --- a/app/controllers/way_controller.rb +++ b/app/controllers/way_controller.rb @@ -67,11 +67,10 @@ class WayController < ApplicationController begin way = Way.find(params[:id]) new_way = Way.from_xml(request.raw_post) - if new_way and new_way.id == way.id - way.delete_with_history(@user) - # if we get here, all is fine, otherwise something will catch below. - render :nothing => true + if new_way and new_way.id == way.id + way.delete_with_history!(new_way, @user) + render :text => way.version.to_s, :content_type => "text/plain" else render :nothing => true, :status => :bad_request end