From 158e22dae006b7e630cdb20e6e37cf93fd8d1c56 Mon Sep 17 00:00:00 2001
From: Paul Mucur <mudge@mudge.name>
Date: Fri, 25 Jun 2010 15:35:11 +0100
Subject: Alias ActiveSupport::OrderedHash#update to
 ActiveSupport::OrderedHash.merge!

This ensures that an OrderedHash's keys are set up appropriately when using update.

[#4973 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 activesupport/lib/active_support/ordered_hash.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index 91de722748..a19d6c3532 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -149,6 +149,8 @@ module ActiveSupport
         self
       end
 
+      alias_method :update, :merge!
+
       def merge(other_hash, &block)
         dup.merge!(other_hash, &block)
       end
-- 
cgit v1.2.3