X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d3ecffa28510c867665001a7615559a185869c6..696bbd169b210bd0ab29a045d8952c9839a09690:/app/controllers/old_controller.rb diff --git a/app/controllers/old_controller.rb b/app/controllers/old_controller.rb index 4869ae3e1..9adf141d9 100644 --- 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 @@ -33,12 +33,12 @@ class OldController < ApplicationController doc.root << element.to_xml_node end - render :text => doc.to_s, :content_type => "text/xml" + render :xml => doc.to_s end def version if @old_element.redacted? && !show_redactions? - render :text => "", :status => :forbidden + head :forbidden else response.last_modified = @old_element.timestamp @@ -46,7 +46,7 @@ class OldController < ApplicationController doc = OSM::API.new.get_xml_doc doc.root << @old_element.to_xml_node - render :text => doc.to_s, :content_type => "text/xml" + render :xml => doc.to_s end end @@ -64,12 +64,12 @@ class OldController < ApplicationController end # just return an empty 200 OK for success - render :text => "" + 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