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

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

diff --git a/app/controllers/api/nodes_controller.rb b/app/controllers/api/nodes_controller.rb
index 891528a5f5790c73ef3a90349a300e4cb569d40a..2962ce070ffe15ebf1cd98f43cb66adaa568c767 100644 (file)
--- a/app/controllers/api/nodes_controller.rb
+++ b/app/controllers/api/nodes_controller.rb
@@ -26,17 +26,13 @@ module Api
 
     # Dump the details on a node given in params[:id]
     def show
 
     # Dump the details on a node given in params[:id]
     def show

-      node = Node.find(params[:id])
-
-      response.last_modified = node.timestamp
+      @node = Node.find(params[:id])

 
 

-      if node.visible
-        @node = node
+      response.last_modified = @node.timestamp

 
 

+      if @node.visible

         # Render the result
         # Render the result

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

       else
         head :gone
       end
       else
         head :gone
       end


@@ -77,9 +73,7 @@ module Api
       @nodes = Node.find(ids)
 
       # Render the result
       @nodes = Node.find(ids)
 
       # Render the result

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

     end
   end
 end
     end
   end
 end