diff options
| author | Mark Longair <mhl@pobox.com> | 2013-05-30 11:54:21 +0100 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-05-30 11:54:21 +0100 |
| commit | 2c41249670f96b2eb29505108d056af5d6e1cb0d (patch) | |
| tree | 55e36f11be648fabeecff9dca41afcf8c4feb23b /app/controllers/track_controller.rb | |
| parent | 4c12459577764432159190e02909510a560823e2 (diff) | |
| parent | 46f740275a130c26b68352cba787dd956d9ee8c1 (diff) | |
Merge branch 'rails-3-develop' into release/0.11
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 |