Merge branch 'master' of git@github.com:rails/rails

3 files changed, 25 insertions, 28 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index e9429d3bb2..e73fc32c59 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -933,6 +933,7 @@ module ActionController #:nodoc:
       def render_to_string(options = nil, &block) #:doc:
         render(options, &block)
       ensure
+        response.content_type = nil
         erase_render_results
         reset_variables_added_to_assigns
       end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index db2d5d885b..da9702a634 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -154,6 +154,10 @@ class TestController < ActionController::Base
     render :json => {:hello => 'world'}.to_json
   end
 
+  def render_json_with_render_to_string
+    render :json => {:hello => render_to_string(:partial => 'partial')}
+  end
+
   def render_custom_code
     render :text => "hello world", :status => 404
   end
@@ -772,6 +776,12 @@ class RenderTest < Test::Unit::TestCase
     assert_equal 'application/json', @response.content_type
   end
 
+  def test_render_json_with_render_to_string
+    get :render_json_with_render_to_string
+    assert_equal '{"hello": "partial html"}', @response.body
+    assert_equal 'application/json', @response.content_type
+  end
+
   def test_render_custom_code
     get :render_custom_code
     assert_response 404
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
index 2fc50b9bfa..950bd72101 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -15,7 +15,7 @@ module ActiveRecord
           method_names.each do |method_name|
             base.class_eval <<-end_code, __FILE__, __LINE__
               def #{method_name}_with_query_dirty(*args)
-                clear_query_cache if query_cache_enabled
+                clear_query_cache if @query_cache_enabled
                 #{method_name}_without_query_dirty(*args)
               end
 
@@ -25,38 +25,24 @@ module ActiveRecord
         end
       end
 
-      def query_cache_enabled
-        Thread.current['query_cache_enabled']
-      end
-
-      def query_cache_enabled=(flag)
-        Thread.current['query_cache_enabled'] = flag
-      end
-
-      def query_cache
-        Thread.current['query_cache']
-      end
-
-      def query_cache=(cache)
-        Thread.current['query_cache'] = cache
-      end
+      attr_reader :query_cache, :query_cache_enabled
 
       # Enable the query cache within the block.
       def cache
-        old, self.query_cache_enabled = query_cache_enabled, true
-        self.query_cache ||= {}
+        old, @query_cache_enabled = @query_cache_enabled, true
+        @query_cache ||= {}
         yield
       ensure
         clear_query_cache
-        self.query_cache_enabled = old
+        @query_cache_enabled = old
       end
 
       # Disable the query cache within the block.
       def uncached
-        old, self.query_cache_enabled = query_cache_enabled, false
+        old, @query_cache_enabled = @query_cache_enabled, false
         yield
       ensure
-        self.query_cache_enabled = old
+        @query_cache_enabled = old
       end
 
       # Clears the query cache.
@@ -66,11 +52,11 @@ module ActiveRecord
       # the same SQL query and repeatedly return the same result each time, silently
       # undermining the randomness you were expecting.
       def clear_query_cache
-        query_cache.clear if query_cache
+        @query_cache.clear if @query_cache
       end
 
       def select_all_with_query_cache(*args)
-        if query_cache_enabled
+        if @query_cache_enabled
           cache_sql(args.first) { select_all_without_query_cache(*args) }
         else
           select_all_without_query_cache(*args)
@@ -78,8 +64,8 @@ module ActiveRecord
       end
 
       def columns_with_query_cache(*args)
-        if query_cache_enabled
-          query_cache["SHOW FIELDS FROM #{args.first}"] ||= columns_without_query_cache(*args)
+        if @query_cache_enabled
+          @query_cache["SHOW FIELDS FROM #{args.first}"] ||= columns_without_query_cache(*args)
         else
           columns_without_query_cache(*args)
         end
@@ -88,11 +74,11 @@ module ActiveRecord
       private
         def cache_sql(sql)
           result =
-            if query_cache.has_key?(sql)
+            if @query_cache.has_key?(sql)
               log_info(sql, "CACHE", 0.0)
-              query_cache[sql]
+              @query_cache[sql]
             else
-              query_cache[sql] = yield
+              @query_cache[sql] = yield
             end
 
           if Array === result