Avoid calling content type multiple times

mark-rushakoff · Apr 29, 2012 · e73f547 · e73f547
1 parent d4dd1af
commit e73f547
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
@@ -91,12 +91,14 @@ module All
 
     add :json do |json, options|
       json = json.to_json(options) unless json.kind_of?(String)
-      unless options[:callback].blank?
-        json = "#{options[:callback]}(#{json})"
+
+      if options[:callback].present?
         self.content_type ||= Mime::JS
+        "#{options[:callback]}(#{json})"
+      else
+        self.content_type ||= Mime::JSON
+        json
       end
-      self.content_type ||= Mime::JSON
-      json
     end
 
     add :js do |js, options|