X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9fb8f5a84bfa96a299dfd1457c185181f15835d8..f4e29905263efbb2eafdedad6a5c050ba559efd8:/app/controllers/search_controller.rb diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 8a632e6a2..3a2e4040f 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -3,6 +3,7 @@ class SearchController < ApplicationController # Can search by tag k, v, or both (type->k,value->v) # Can search by name (k=name,v=....) skip_before_action :verify_authenticity_token + authorize_resource :class => false def search_all do_search(true, true, true) @@ -33,13 +34,13 @@ class SearchController < ApplicationController if do_nodes response.headers["Error"] = "Searching of nodes is currently unavailable" - render :text => "", :status => :service_unavailable + head :service_unavailable return false end unless value response.headers["Error"] = "Searching for a key without value is currently unavailable" - render :text => "", :status => :service_unavailable + head :service_unavailable return false end @@ -91,9 +92,9 @@ class SearchController < ApplicationController end relations.each do |rel| - doc.root << rel.to_xml_node(nil, changeset_cache, user_display_name_cache) + doc.root << rel.to_xml_node(changeset_cache, user_display_name_cache) end - render :text => doc.to_s, :content_type => "text/xml" + render :xml => doc.to_s end end