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

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

diff --git a/app/controllers/api/relations_controller.rb b/app/controllers/api/relations_controller.rb
index 2f2cb8503217970f21ede6477e7ae9cca08524a3..ba0dd0c6bb99ae870211f19568b3ad8445dc434c 100644 (file)
--- a/app/controllers/api/relations_controller.rb
+++ b/app/controllers/api/relations_controller.rb
@@ -26,9 +26,7 @@ module Api
       response.last_modified = @relation.timestamp
       if @relation.visible
         # Render the result
       response.last_modified = @relation.timestamp
       if @relation.visible
         # Render the result

-        respond_to do |format|
-          format.xml
-        end
+        render :formats => [:xml]

       else
         head :gone
       end
       else
         head :gone
       end


@@ -119,9 +117,7 @@ module Api
         @relations << relation
 
         # Render the result
         @relations << relation
 
         # Render the result

-        respond_to do |format|
-          format.xml
-        end
+        render :formats => [:xml]

       else
         head :gone
       end
       else
         head :gone
       end


@@ -137,9 +133,7 @@ module Api
       @relations = Relation.find(ids)
 
       # Render the result
       @relations = Relation.find(ids)
 
       # Render the result

-      respond_to do |format|
-        format.xml
-      end
+      render :formats => [:xml]

     end
 
     def relations_for_way
     end
 
     def relations_for_way


@@ -166,9 +160,7 @@ module Api
       end
 
       # Render the result
       end
 
       # Render the result

-      respond_to do |format|
-        format.xml
-      end
+      render :formats => [:xml]

     end
   end
 end
     end
   end
 end