aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/new_base/compatibility.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/new_base/compatibility.rb')
-rw-r--r--actionpack/lib/action_controller/new_base/compatibility.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index db471f7658..3b1a74ec0c 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -26,6 +26,9 @@ module ActionController
if options.is_a?(Hash) && options.key?(:template)
options[:template].sub!(/^\//, '')
end
+
+ options[:text] = nil if options[:nothing] == true
+
super
end