From 2b0fca91404b288d03f2b1a642ad7bb5227f9680 Mon Sep 17 00:00:00 2001 From: Mat Brown Date: Tue, 8 Mar 2011 15:40:03 -0500 Subject: [PATCH] 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 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 887c701..75901bc 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| -- 1.7.1