From fb34f8577c47d958ca32b7ab585c1904e1a776b1 Mon Sep 17 00:00:00 2001 From: Mat Brown Date: Wed, 9 Mar 2011 04:40:03 +0800 Subject: Rename conflicting ActionMailer::MailHelper#simple_format method This was conflicting with ActionView::Helpers::TextHelper#simple_format from within email templates. --- actionmailer/lib/action_mailer/mail_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') 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| -- cgit v1.2.3