From 6b15a45e65addc97bcf30b9d141f97c63df898e8 Mon Sep 17 00:00:00 2001
From: Olli Jokinen <olli.jokinen@enemy.fi>
Date: Thu, 28 Jul 2011 14:42:20 +0300
Subject: Change mimetype to Mime::JS if JSONP is used

---
 actionpack/lib/action_controller/metal/renderers.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 0ad9dbeda9..1eab57070f 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -93,7 +93,10 @@ module ActionController
 
     add :json do |json, options|
       json = json.to_json(options) unless json.kind_of?(String)
-      json = "#{options[:callback]}(#{json})" unless options[:callback].blank?
+      unless options[:callback].blank?
+        json = "#{options[:callback]}(#{json})"
+        self.content_type ||= Mime::JS
+      end
       self.content_type ||= Mime::JSON
       json
     end
-- 
cgit v1.2.3