Browse files

Even though exempt_from_layout is no longer needed, some people are s…

…till using it. Deprecate it instead of removing.
  • Loading branch information...
1 parent 7a1bba4 commit 01186652ccc546842591ebf6e1d42225797ec5d4 @wycats wycats committed Aug 3, 2010
Showing with 6 additions and 1 deletion.
  1. +6 −1 actionpack/lib/action_controller/deprecated/base.rb
View
7 actionpack/lib/action_controller/deprecated/base.rb
@@ -120,9 +120,14 @@ def filter_parameter_logging(*args, &block)
# This was moved to a plugin
def verify(*args)
- ActiveSupport::Deprecation.warn "verify was removed from Rails and is now available as a plugin. " <<
+ ActiveSupport::Deprecation.warn "verify was removed from Rails and is now available as a plugin. " \
"Please install it with `rails plugin install git://github.com/rails/verification.git`.", caller
end
+
+ def exempt_from_layout(*)
+ ActiveSupport::Deprecation.warn "exempt_from_layout is no longer needed, because layouts in Rails 3 " \
+ "are restricted to the content-type of the template that was rendered.", caller
+ end
end
extend DeprecatedBehavior

0 comments on commit 0118665

Please sign in to comment.