diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 12:04:43 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-11 12:04:43 -0700 |
| commit | 94ee9d245289a36207847a684b51dbd1c7a6a4eb (patch) | |
| tree | 41b320c5e27e584704d745a22cffdf099ebfbf15 /actionpack/lib/action_controller/new_base/compatibility.rb | |
| parent | c1d120a71e74aa3ccab6dc28a5406b87a51a69c1 (diff) | |
| download | rails-94ee9d245289a36207847a684b51dbd1c7a6a4eb.tar.gz rails-94ee9d245289a36207847a684b51dbd1c7a6a4eb.tar.bz2 rails-94ee9d245289a36207847a684b51dbd1c7a6a4eb.zip | |
Ported ConditionalGet to new Base
Diffstat (limited to 'actionpack/lib/action_controller/new_base/compatibility.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/compatibility.rb | 3 |
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 |