2 files changed, 15 insertions, 9 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb
index 3fc64fa8a5..c23d605c5f 100644
--- a/actionview/lib/action_view/helpers/text_helper.rb
+++ b/actionview/lib/action_view/helpers/text_helper.rb
@@ -150,7 +150,7 @@ module ActionView
       def excerpt(text, phrase, options = {})
         return unless text && phrase
 
-        separator = options.fetch(:separator, "")
+        separator = options[:separator] || ''
         phrase    = Regexp.escape(phrase)
         regex     = /#{phrase}/i
 
@@ -171,7 +171,8 @@ module ActionView
         prefix, first_part   = cut_excerpt_part(:first, first_part, separator, options)
         postfix, second_part = cut_excerpt_part(:second, second_part, separator, options)
 
-        prefix + (first_part + separator + phrase + separator + second_part).strip + postfix
+        affix = [first_part, separator, phrase, separator, second_part].join.strip
+        [prefix, affix, postfix].join
       end
 
       # Attempts to pluralize the +singular+ word unless +count+ is 1. If
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb
index c1945cc0c5..18a0788f8e 100644
--- a/actionview/lib/action_view/rendering.rb
+++ b/actionview/lib/action_view/rendering.rb
@@ -77,13 +77,6 @@ module ActionView
       @_view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
-    # Render template to response_body
-    # :api: public
-    def render(*args, &block)
-      options = _normalize_render(*args, &block)
-      self.response_body = render_to_body(options)
-    end
-
     # Find and renders a template based on the options given.
     # :api: private
     def _render_template(options) #:nodoc:
@@ -91,12 +84,24 @@ module ActionView
       view_renderer.render(view_context, options)
     end
 
+    def render_to_body(options = {})
+      _process_options(options)
+      _render_template(options)
+    end
+
     def rendered_format
       Mime[lookup_context.rendered_format]
     end
 
     private
 
+      # Assign the rendered format to lookup context.
+      def _process_format(format) #:nodoc:
+        super
+        lookup_context.formats = [format.to_sym]
+        lookup_context.rendered_format = lookup_context.formats.first
+      end
+
       # Normalize args by converting render "foo" to render :action => "foo" and
       # render "foo/bar" to render :file => "foo/bar".
       # :api: private