Merge remote-tracking branch 'upstream/pull/2881'

[rails.git] / app / controllers / api / ways_controller.rb

diff --git a/app/controllers/api/ways_controller.rb b/app/controllers/api/ways_controller.rb
index 3b58f208b14e729a696a0f7e2e0ba0cd6ada631e..a0feabff3a82a504b9a31f5dfd397601e99d8e27 100644 (file)
--- a/app/controllers/api/ways_controller.rb
+++ b/app/controllers/api/ways_controller.rb
@@ -43,9 +43,7 @@ module Api
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
 

-      unless new_way && new_way.id == way.id
-        raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})"
-      end
+      raise OSM::APIBadUserInput, "The id in the url (#{way.id}) is not the same as provided in the xml (#{new_way.id})" unless new_way && new_way.id == way.id

 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s
 
       way.update_from(new_way, current_user)
       render :plain => way.version.to_s


@@ -90,9 +88,7 @@ module Api
     end
 
     def index
     end
 
     def index

-      unless params["ways"]
-        raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]"
-      end
+      raise OSM::APIBadUserInput, "The parameter ways is required, and must be of the form ways=id[,id[,id...]]" unless params["ways"]

 
       ids = params["ways"].split(",").collect(&:to_i)
 
 
       ids = params["ways"].split(",").collect(&:to_i)