aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/track_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-02-01 16:39:53 +0000
committerLouise Crow <louise.crow@gmail.com>2013-02-01 16:39:53 +0000
commit63d576de4309b527a2a7ed4fc8f5cf43cae0538b (patch)
tree8e169a92a570858cd6be1ccc642c8f9f6bb1edb7 /app/controllers/track_controller.rb
parent39f74e92f0785eb3da2001d93682b8d1aadd35d5 (diff)
parentf077394dc1130df36a7f17784eaac5c79c60df24 (diff)
Merge remote-tracking branch 'openaustralia_github/xss_escaping_fixes' into develop
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) }
) } }