diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-18 09:08:03 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-04-18 09:08:03 -0700 |
| commit | 296830ed0f8732c6779dcdfed0f0e3d59947e47c (patch) | |
| tree | 900114e542088830f1eca2d6d3362823e82efc42 /actionpack/lib/abstract_controller/layouts.rb | |
| parent | dba6a078ee22264bd2d305fd30a7b9ba8d9af983 (diff) | |
| parent | 14c196e5a3f78ea4672b691a09ba60524b31fb73 (diff) | |
| download | rails-296830ed0f8732c6779dcdfed0f0e3d59947e47c.tar.gz rails-296830ed0f8732c6779dcdfed0f0e3d59947e47c.tar.bz2 rails-296830ed0f8732c6779dcdfed0f0e3d59947e47c.zip | |
Merge pull request #10262 from printercu/patch-3
Avoid leak into controller's action_methods
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index bac994496e..8e7bdf620e 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -309,6 +309,7 @@ module AbstractController RUBY when Proc define_method :_layout_from_proc, &_layout + protected :_layout_from_proc <<-RUBY result = _layout_from_proc(#{_layout.arity == 0 ? '' : 'self'}) return #{default_behavior} if result.nil? |