diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-06-14 13:13:13 +0430 |
| commit | bf7429041e64ee0f347764a4579c8c1d14d5b391 (patch) | |
| tree | e52044f40d8ea2310aef97790b5374ac8b8558a4 /actionpack/lib | |
| parent | 4b05de19aaebcbe20941e8b13aaed2060759ed1c (diff) | |
| parent | c125116013d4b4222f507cfbd1da5ae90bd225d9 (diff) | |
| download | rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.gz rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.tar.bz2 rails-bf7429041e64ee0f347764a4579c8c1d14d5b391.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index b7f404f5d8..4d06ca0d89 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -2,7 +2,7 @@ require 'active_support/core_ext/module/attr_internal' require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/array/wrap' -require 'active_support/ordered_options.rb' +require 'active_support/ordered_options' module ActionView #:nodoc: class NonConcattingString < ActiveSupport::SafeBuffer diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 4198013f57..4d35296932 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -56,7 +56,7 @@ module ActionView :identifier => template.identifier, :layout => layout.try(:virtual_path)) do content = template.render(self, locals) { |*name| _layout_for(*name) } - @_content_for[:layout] = content + @_content_for[:layout] = content if layout content = _render_layout(layout, locals) if layout content |