aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2011-05-13 00:28:38 -0400
committerPrem Sichanugrist <s@sikachu.com>2011-05-13 18:25:32 -0400
commitf2769ebd7eaa4bdc9aabfbff23c1ef3cbc7d4f9f (patch)
tree3b18f502faa772a3191898c9b5618441727ed752 /actionmailer
parenta4a338167e752a4d92c64c7133ff4c975155ab7b (diff)
downloadrails-f2769ebd7eaa4bdc9aabfbff23c1ef3cbc7d4f9f.tar.gz
rails-f2769ebd7eaa4bdc9aabfbff23c1ef3cbc7d4f9f.tar.bz2
rails-f2769ebd7eaa4bdc9aabfbff23c1ef3cbc7d4f9f.zip
Update Mailer generator to use 1.9 styled hash when run on Ruby 1.9
As always, you can run `--old-style-hash` to override that.
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/rails/generators/mailer/templates/mailer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
index 370a508cad..88b074cef5 100644
--- a/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
+++ b/actionmailer/lib/rails/generators/mailer/templates/mailer.rb
@@ -1,6 +1,6 @@
<% module_namespacing do -%>
class <%= class_name %> < ActionMailer::Base
- default :from => "from@example.com"
+ default <%= key_value :from, '"from@example.com"' %>
<% for action in actions -%>
# Subject can be set in your I18n file at config/locales/en.yml
@@ -11,7 +11,7 @@ class <%= class_name %> < ActionMailer::Base
def <%= action %>
@greeting = "Hi"
- mail :to => "to@example.org"
+ mail <%= key_value :to, '"to@example.org"' %>
end
<% end -%>
end