From f564f947d94645dca8ff67fc5c2ad161eb2bb187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 7 Jan 2010 14:20:31 +0100
Subject: Remove duplicated url_for code and move methods shared between
 ActionMailer and ActionController up to AbstractController.

---
 actionmailer/lib/action_mailer/base.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'actionmailer/lib/action_mailer')

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index c2ffa5a0e9..e644c47e9c 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -259,10 +259,9 @@ module ActionMailer #:nodoc:
     include AbstractController::LocalizedCache
     include AbstractController::Layouts
     include AbstractController::Helpers
+    include AbstractController::UrlFor
 
     helper  ActionMailer::MailHelper
-
-    include ActionController::UrlWriter
     include ActionMailer::DeprecatedBody
 
     private_class_method :new #:nodoc:
-- 
cgit v1.2.3