github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 16:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

prefer sibling actionpack

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4481 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2006-06-21 20:37:09 +00:00
parent a28817948d
commit e381eccbe2
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
actionmailer/lib/action_mailer.rb
View File

@@ -21,11 +21,10 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
begin
require 'action_controller'
rescue LoadError
unless defined?(ActionController)
begin
require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller'
$:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
require 'action_controller'
rescue LoadError
require 'rubygems'
require_gem 'actionpack', '>= 1.9.1'
@@ -48,4 +47,4 @@ ActionMailer::Base.class_eval do
helper MailHelper
end
silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) }
silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) }