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

[rails.git] / app / controllers / old_controller.rb

diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb
index f41a94a33eb9d73f13da2f440899bd778ab88b63..9adf141d959f4a319ec39c64a97826a573faf49b 100644 (file)
--- a/app/controllers/old_controller.rb
+++ b/app/controllers/old_controller.rb
@@ -19,7 +19,7 @@ class OldController < ApplicationController
     # the .where() method used in the lookup_old_element_versions
     # call won't throw an error if no records are found, so we have
     # to do that ourselves.
-    raise OSM::APINotFoundError.new if @elements.empty?
+    raise OSM::APINotFoundError if @elements.empty?
 
     doc = OSM::API.new.get_xml_doc
 
@@ -64,12 +64,12 @@ class OldController < ApplicationController
     end
 
     # just return an empty 200 OK for success
-    render :nothing => true
+    head :ok
   end
 
   private
 
   def show_redactions?
-    @user && @user.moderator? && params[:show_redactions] == "true"
+    current_user && current_user.moderator? && params[:show_redactions] == "true"
   end
 end