Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8112

Show
Ignore:
Timestamp:
11/07/07 19:29:21 (1 year ago)
Author:
bitsweat
Message:

Rearrange vendor bundles so gem overrides work correctly.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionmailer/lib/action_mailer.rb

    r8084 r8112  
    3232end 
    3333 
    34 # attempt to load the TMail gem 
    35 begin 
    36   require 'rubygems' 
    37   gem 'TMail', '> 1.1.0' 
    38   require 'tmail' 
    39 rescue Gem::LoadError 
    40   # no gem, fall back to vendor copy 
    41 end 
     34require 'action_mailer/vendor' 
     35require 'tmail' 
    4236 
    43 $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/") 
    44  
    45 require 'tmail' 
    4637require 'action_mailer/base' 
    4738require 'action_mailer/helpers' 
    …… 
    4940require 'action_mailer/quoting' 
    5041require 'action_mailer/test_helper' 
     42 
    5143require 'net/smtp' 
    5244