aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMat Brown <mat@cliqueinnyc.com>2011-03-09 04:40:03 +0800
committerJosé Valim <jose.valim@gmail.com>2011-03-09 05:49:01 +0800
commitfb34f8577c47d958ca32b7ab585c1904e1a776b1 (patch)
tree0660005634f51cd1ec985c144598bbbcb83368f2 /actionmailer
parent092538045e890e0a8769cc99586c8483426e0e2e (diff)
downloadrails-fb34f8577c47d958ca32b7ab585c1904e1a776b1.tar.gz
rails-fb34f8577c47d958ca32b7ab585c1904e1a776b1.tar.bz2
rails-fb34f8577c47d958ca32b7ab585c1904e1a776b1.zip
Rename conflicting ActionMailer::MailHelper#simple_format method
This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates.
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/mail_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 887c7012d9..75901bc431 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -4,7 +4,7 @@ module ActionMailer
# each line, and wrapped at 72 columns.
def block_format(text)
formatted = text.split(/\n\r\n/).collect { |paragraph|
- simple_format(paragraph)
+ format_paragraph(paragraph)
}.join("\n")
# Make list points stand on their own line
@@ -30,7 +30,7 @@ module ActionMailer
end
private
- def simple_format(text, len = 72, indent = 2)
+ def format_paragraph(text, len = 72, indent = 2)
sentences = [[]]
text.split.each do |word|