diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-18 23:27:05 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-19 14:26:42 -0200 |
| commit | 555b7cd04a268073d69478eee6e90ac4c749c38c (patch) | |
| tree | 833d88d1851b0778154d0dcf18ffac4b00083ef8 /actionpack | |
| parent | b1ffd65b8f96391748d9034317b4e6ce8ded7eb4 (diff) | |
| download | rails-555b7cd04a268073d69478eee6e90ac4c749c38c.tar.gz rails-555b7cd04a268073d69478eee6e90ac4c749c38c.tar.bz2 rails-555b7cd04a268073d69478eee6e90ac4c749c38c.zip | |
Don't merge just directly add to the action to the :partial key
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 48171e6bd1..83e7c902ef 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -144,7 +144,7 @@ module AbstractController key = action.include?(?/) ? :file : :action options[key] = action else - options.merge!(:partial => action) + options[:partial] = action end options |