X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7151fa05e4d4f73956d7f9a7ad2db1f5b956a0c0..233a97bfcbee9c82027c049bb8bafac2693ec359:/app/controllers/way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index cf1634fa5..6f4704c77 100644
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -12,11 +12,10 @@ class WayController < ApplicationController
       way = Way.from_xml(request.raw_post, true)
 
       if way
-        if !way.preconditions_ok?
+        unless way.preconditions_ok?
           render :text => "", :status => :precondition_failed
         else
           way.version = 0
-          way.user_id = @user.id
           way.save_with_history!
 
           render :text => way.id.to_s, :content_type => "text/plain"
@@ -69,10 +68,15 @@ class WayController < ApplicationController
   def delete
     begin
       way = Way.find(params[:id])
-      way.delete_with_history(@user)
+      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 we get here, all is fine, otherwise something will catch below.  
+        render :nothing => true
+      else
+        render :nothing => true, :status => :bad_request
+      end
     rescue OSM::APIError => ex
       render ex.render_opts
     rescue ActiveRecord::RecordNotFound