From 555b7cd04a268073d69478eee6e90ac4c749c38c Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Thu, 18 Nov 2010 23:27:05 -0200
Subject: Don't merge just directly add to the action to the :partial key

---
 actionpack/lib/abstract_controller/rendering.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack')

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
-- 
cgit v1.2.3