aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/track_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-14 16:48:08 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-14 16:48:08 +0000
commitd48bfd58f6ff26b2a34aa8d71d9d691f9fbc10e2 (patch)
treec026e8e6639f7f9ceed92b75fb8ed657c566d788 /app/controllers/track_controller.rb
parentf8cf582f8c7461bfd680aac9c87cb5377c39c30c (diff)
parent0747a2d66f65fd22d8ea275d9df29a7981a46d07 (diff)
Merge branch 'release/0.7' into wdtk
Diffstat (limited to 'app/controllers/track_controller.rb')
-rw-r--r--app/controllers/track_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index 51e081c88..15da7f327 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -157,7 +157,7 @@ class TrackController < ApplicationController
def atom_feed_internal
@xapian_object = perform_search([InfoRequestEvent], @track_thing.track_query, @track_thing.params[:feed_sortby], nil, 25, 1)
respond_to do |format|
- format.atom { render :template => 'track/atom_feed' }
+ format.atom { render :template => 'track/atom_feed', :content_type => "application/atom+xml" }
format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true,
lambda { |t| @template.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) }
) } }