kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases 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
Show stats 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. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++ #++
begin unless defined?(ActionController)
require 'action_controller'
rescue LoadError
begin begin
require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller' $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
require 'action_controller'
rescue LoadError rescue LoadError
require 'rubygems' require 'rubygems'
require_gem 'actionpack', '>= 1.9.1' require_gem 'actionpack', '>= 1.9.1'
@ -48,4 +47,4 @@ ActionMailer::Base.class_eval do
helper MailHelper helper MailHelper
end end
silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) } silence_warnings { TMail::Encoder.const_set("MAX_LINE_LEN", 200) }