diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-30 11:53:22 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-30 11:53:22 +0100 |
| commit | 46f740275a130c26b68352cba787dd956d9ee8c1 (patch) | |
| tree | ed5e13d2837d76dc30a088ccc371eb91210fe397 /app/controllers/track_controller.rb | |
| parent | 197029c5bcadaa905234183dbfb208e4bf0f77f7 (diff) | |
| parent | 2376834e80b736e4eb4f4dcbdbb3988cafa6cc5b (diff) | |
Merge branch 'feed-content-type' into rails-3-develop
Diffstat (limited to 'app/controllers/track_controller.rb')
| -rw-r--r-- | app/controllers/track_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb index 9076148c4..40e82e7a4 100644 --- a/app/controllers/track_controller.rb +++ b/app/controllers/track_controller.rb @@ -157,7 +157,7 @@ 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 => :atom } + format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => 'application/atom+xml' } end end |