Move render :nothing and :text => nil options to AC::Rendering

Sporky023 · Jan 17, 2012 · 6244d16 · 6244d16
1 parent 562a12d
commit 6244d16
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
@@ -165,6 +165,9 @@ def _normalize_options(options)
         options[:prefixes] ||= _prefixes
       end
 
+      options[:text] = nil if options.delete(:nothing) == true
+      options[:text] = " " if options.key?(:text) && options[:text].nil?
+
       options[:template] ||= (options[:action] || action_name).to_s
       options
     end

diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -14,12 +14,6 @@ class << self
       ]
     end
 
-    def _normalize_options(options)
-      options[:text] = nil if options.delete(:nothing) == true
-      options[:text] = " " if options.key?(:text) && options[:text].nil?
-      super
-    end
-
     def render_to_body(options)
       super || " "
     end
@@ -31,9 +25,5 @@ def _handle_method_missing
     def method_for_action(action_name)
       super || (respond_to?(:method_missing) && "_handle_method_missing")
     end
-
-    def performed?
-      response_body
-    end
   end
 end