From 9e77408fdd0ffc170b51be1d225bc10cf1034add Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 5 Jun 2013 16:07:19 +0100 Subject: We're assuming feed urls without format suffixes should serve up atom/xml, so ignore any format from content negotiation in favour of that default. --- app/controllers/track_controller.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/controllers/track_controller.rb') diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 40e82e7a4..40fa69290 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -153,6 +153,9 @@ class TrackController < ApplicationController def atom_feed_internal @xapian_object = perform_search([InfoRequestEvent], @track_thing.track_query, @track_thing.params[:feed_sortby], nil, 25, 1) + # We're assuming that a request to a feed url with no format suffix wants atom/xml + # so set that as the default, regardless of content negotiation + request.format = 'xml' unless params[:format] respond_to do |format| format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true, lambda { |t| view_context.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) } -- cgit v1.2.3