From 418639b4cfe477d7309fa53e8b8e2472b44bda80 Mon Sep 17 00:00:00 2001
From: Mikel Lindsaar <raasdnil@gmail.com>
Date: Thu, 17 Dec 2009 12:00:32 +1100
Subject: Fixes for working with 1.9.1-head

---
 actionmailer/lib/action_mailer.rb             |  2 +-
 actionmailer/lib/action_mailer/base.rb        |  1 -
 actionmailer/lib/action_mailer/mail_helper.rb | 19 -------------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 actionmailer/lib/action_mailer/mail_helper.rb

(limited to 'actionmailer/lib')

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index e7ad68e212..e8adbf0eff 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -54,5 +54,5 @@ module Net
 end
 
 
-gem 'mail', '>= 1.3.0'
+gem 'mail', '>= 1.3.2'
 require 'mail'
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 24064b3a74..ab00bbba3c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -258,7 +258,6 @@ module ActionMailer #:nodoc:
     include AbstractController::Layouts
 
     include AbstractController::Helpers
-    helper ActionMailer::MailHelper
 
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
deleted file mode 100644
index 9aa178cdef..0000000000
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module ActionMailer
-  module MailHelper
-    # Uses Text::Format to take the text and format it, indented two spaces for
-    # each line, and wrapped at 72 columns.
-    def block_format(text)
-      formatted = text.split(/\n\r\n/).collect { |paragraph|
-        Text::Format.new(
-          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
-        ).format
-      }.join("\n")
-    
-      # Make list points stand on their own line
-      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
-
-      formatted
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3