aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-10-03 14:58:18 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-10-03 14:58:23 -0200
commit49203126430c6dbaf9ce47c21c58c4081fb53e82 (patch)
tree6f00fdf0dcd22fd50023b73d40bf550e89a3c1d6 /actionmailer/lib
parent10249d7b7728525fb7660409e3bbc9e0286dbf0f (diff)
downloadrails-49203126430c6dbaf9ce47c21c58c4081fb53e82.tar.gz
rails-49203126430c6dbaf9ce47c21c58c4081fb53e82.tar.bz2
rails-49203126430c6dbaf9ce47c21c58c4081fb53e82.zip
PERF: Don't create unnecessary objects
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/old_api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb
index a9cdf6c0ca..0396f0775e 100644
--- a/actionmailer/lib/action_mailer/old_api.rb
+++ b/actionmailer/lib/action_mailer/old_api.rb
@@ -248,7 +248,7 @@ module ActionMailer
else
ctype, *attrs = @content_type.split(/;\s*/)
attrs = Hash[attrs.map { |attr| attr.split(/\=/, 2) }]
- [ctype, {"charset" => @charset}.merge(attrs)]
+ [ctype, {"charset" => @charset}.merge!(attrs)]
end
end
end