Created
April 6, 2011 00:13
-
-
Save rhunter/904870 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 339d3fbef0359be6e5a664087cd3791472edd187 Mon Sep 17 00:00:00 2001 | |
From: Rob Hunter <rhunter@iplayup.com> | |
Date: Wed, 6 Apr 2011 10:12:45 +1000 | |
Subject: [PATCH] Goals API: Preserve content type in implicitly JSON requests | |
--- | |
app/controllers/api/goals/base_controller.rb | 6 ++++-- | |
1 files changed, 4 insertions(+), 2 deletions(-) | |
diff --git a/app/controllers/api/goals/base_controller.rb b/app/controllers/api/goals/base_controller.rb | |
index 9b7f43e..8c4dae5 100644 | |
--- a/app/controllers/api/goals/base_controller.rb | |
+++ b/app/controllers/api/goals/base_controller.rb | |
@@ -13,9 +13,11 @@ class Api::Goals::BaseController < BaseApplicationController | |
# This is unnecessary in Rails 3, thanks to responds_to | |
def respond_to_json(*args) | |
# Rails 2 doesn't seem to provide a convenient way to follow Accept order, so "first" will do | |
- return unless self.request.accepts.any? {|mime_type| mime_type.to_sym == :json} | |
+ supported_mime_type = self.request.accepts.detect {|mime_type| mime_type.to_sym == :json} | |
+ return unless supported_mime_type | |
- self.request.format = :json | |
+ self.request.format = supported_mime_type | |
+ self.response.content_type = supported_mime_type | |
end | |
ssl_exceptions # no exceptions by default, everything is SSL | |
-- | |
1.7.4.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment