diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:50:26 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 16:55:27 -0700 |
| commit | 28dbeb3a643eeb35767df55ed579f54438c3ee18 (patch) | |
| tree | 67d8e6dfa2d4fc7a7811175a3250ef8ff5bd8bba /actionpack/lib/action_controller | |
| parent | 63ed43cb9901cc7adc352a51fa256c3ba7b6637f (diff) | |
| download | rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.gz rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.tar.bz2 rails-28dbeb3a643eeb35767df55ed579f54438c3ee18.zip | |
Get controller/render_other_test.rb to pass on new base and fixed a bug in new base with regards to rendering layouts.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/abstract/layouts.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb index b3b743d6e8..8721e5f4dc 100644 --- a/actionpack/lib/action_controller/abstract/layouts.rb +++ b/actionpack/lib/action_controller/abstract/layouts.rb @@ -85,7 +85,7 @@ module AbstractController end begin - _layout_for_name(_layout) if _action_has_layout? + _layout_for_name(_layout, details) if _action_has_layout? rescue NameError => e raise NoMethodError, "You specified #{@_layout.inspect} as the layout, but no such method was found" |