diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-09 07:27:44 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-09 07:27:44 +0000 |
| commit | e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67 (patch) | |
| tree | bb21f2713880c9f8841094e2fcf270fb5c69596d /actionpack/lib/action_view/base.rb | |
| parent | 46110aa689412816d077b1f248a6cdb4d9552eda (diff) | |
| download | rails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.tar.gz rails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.tar.bz2 rails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.zip | |
Fixed that render :partial would fail when :object was a Hash (due to backwards compatibility issues) #2148 [Sam Stephenson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index fbc9a66a05..cbaeedc0fe 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -137,6 +137,9 @@ module ActionView #:nodoc: @@compiled_templates = CompiledTemplates.new include @@compiled_templates + class ObjectWrapper < Struct.new(:value) #:nodoc: + end + def self.load_helpers(helper_dir)#:nodoc: Dir.foreach(helper_dir) do |helper_file| next unless helper_file =~ /_helper.rb$/ @@ -200,7 +203,7 @@ module ActionView #:nodoc: elsif options[:partial] && options[:collection] render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals]) elsif options[:partial] - render_partial(options[:partial], options[:object], options[:locals]) + render_partial(options[:partial], ActionView::Base::ObjectWrapper.new(options[:object]), options[:locals]) elsif options[:inline] render_template(options[:type] || :rhtml, options[:inline], nil, options[:locals] || {}) end |