diff options
| author | Mehmet Emin İNAÇ <mehmetemininac@gmail.com> | 2015-04-07 17:18:59 +0300 |
|---|---|---|
| committer | Mehmet Emin İNAÇ <mehmetemininac@gmail.com> | 2015-04-08 11:39:29 +0300 |
| commit | c51aa9f6f2c361e1efc53020028592564318e8a6 (patch) | |
| tree | 7e5785b99eff9376d86c72fd3c03fa0f1bec35af /actionview/lib/action_view/layouts.rb | |
| parent | 060ee2c6c94cf7050bd8be22c79e053fd602579d (diff) | |
| download | rails-c51aa9f6f2c361e1efc53020028592564318e8a6.tar.gz rails-c51aa9f6f2c361e1efc53020028592564318e8a6.tar.bz2 rails-c51aa9f6f2c361e1efc53020028592564318e8a6.zip | |
fix for actionview parent layout bug
This commit fixes issue #19626
Don't need to check layout conditions if there is no condition
test for parent layout bug fix
Diffstat (limited to 'actionview/lib/action_view/layouts.rb')
| -rw-r--r-- | actionview/lib/action_view/layouts.rb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/actionview/lib/action_view/layouts.rb b/actionview/lib/action_view/layouts.rb index 9d636c8c9e..1fc609f2cd 100644 --- a/actionview/lib/action_view/layouts.rb +++ b/actionview/lib/action_view/layouts.rb @@ -315,16 +315,25 @@ module ActionView name_clause end - self.class_eval <<-RUBY, __FILE__, __LINE__ + 1 - def _layout - if _conditional_layout? + if self._layout_conditions.empty? + self.class_eval <<-RUBY, __FILE__, __LINE__ + 1 + def _layout #{layout_definition} - else - #{name_clause} end - end - private :_layout - RUBY + private :_layout + RUBY + else + self.class_eval <<-RUBY, __FILE__, __LINE__ + 1 + def _layout + if _conditional_layout? + #{layout_definition} + else + #{name_clause} + end + end + private :_layout + RUBY + end end private |