aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/track_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2014-01-24 10:36:38 +0000
committerLouise Crow <louise.crow@gmail.com>2014-01-24 10:36:38 +0000
commit1445541f487fe22ec44b71607be3300319338d0a (patch)
tree5c9ed659c968f092317de6bab59a712e2584ca66 /app/controllers/track_controller.rb
parent4eb8432dedc8b521086cdf163ebe5d373396d39a (diff)
parentb0a939a4d44077b4602176042ff4432b790561ad (diff)
Merge branch 'release/0.16'0.16
Diffstat (limited to 'app/controllers/track_controller.rb')
-rw-r--r--app/controllers/track_controller.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index 72c092221..1123903f9 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -160,7 +160,10 @@ class TrackController < ApplicationController
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) }
) } }
- format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => 'application/atom+xml' }
+ format.any { render :template => 'track/atom_feed',
+ :formats => ['atom'],
+ :layout => false,
+ :content_type => 'application/atom+xml' }
end
end