diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-07-18 00:22:12 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-07-18 00:22:26 +0100 |
| commit | fcbde454f673a2b393942b09f855a4febcf331fa (patch) | |
| tree | e236d6b30d1606b15ff07fcebb1375dc451b6b47 /actionpack/lib/abstract_controller | |
| parent | e9bd83402ed1ab86e70c9ec6ffc913b72fd41f1d (diff) | |
| download | rails-fcbde454f673a2b393942b09f855a4febcf331fa.tar.gz rails-fcbde454f673a2b393942b09f855a4febcf331fa.tar.bz2 rails-fcbde454f673a2b393942b09f855a4febcf331fa.zip | |
Don't do remove_possible_method when delegate is used. Two reasons: 1) warnings should be shown, and fixed at the source and 2) the code is slow. Fixes #1937.
Diffstat (limited to 'actionpack/lib/abstract_controller')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index d6f75bded0..10aa34c76b 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -139,7 +139,7 @@ module AbstractController # # end # - # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will + # This will assign "weblog_standard" as the WeblogController's layout for all actions except for the +rss+ action, which will # be rendered directly, without wrapping a layout around the rendered view. # # Both the <tt>:only</tt> and <tt>:except</tt> condition can accept an arbitrary number of method references, so @@ -167,6 +167,7 @@ module AbstractController included do class_attribute :_layout_conditions + remove_possible_method :_layout_conditions delegate :_layout_conditions, :to => :'self.class' self._layout_conditions = {} _write_layout_method |