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

Changeset 2247

Show
Ignore:
Timestamp:
09/15/05 05:34:59 (3 years ago)
Author:
david
Message:

Only attempt to require Active Support if it hasnt been already #1959

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/lib/action_controller.rb

    r2230 r2247  
    2222#++ 
    2323 
    24 $:.unshift(File.dirname(__FILE__)) 
    25 $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
     24$:.unshift(File.dirname(__FILE__)) unless 
     25  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) 
    2626 
    27 begin 
    28   require 'active_support'   
    29 rescue LoadError 
    30   require 'rubygems' 
    31   require_gem 'activesupport' 
     27unless defined?(ActiveSupport) 
     28  begin 
     29    $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
     30    require 'active_support'   
     31  rescue LoadError 
     32    require 'rubygems' 
     33    require_gem 'activesupport' 
     34  end 
    3235end 
    3336 

  • trunk/activerecord/lib/active_record.rb

    r1470 r2247  
    2222#++ 
    2323 
     24$:.unshift(File.dirname(__FILE__)) unless 
     25  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) 
    2426 
    25 $:.unshift(File.dirname(__FILE__)) 
    26 $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib") 
    27  
    28 begin 
    29   require 'active_support'   
    30 rescue LoadError 
    31   require 'rubygems' 
    32   require_gem 'activesupport' 
     27unless defined?(ActiveSupport) 
     28  begin 
     29    $:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")   
     30    require 'active_support'   
     31  rescue LoadError 
     32    require 'rubygems' 
     33    require_gem 'activesupport' 
     34  end 
    3335end 
    3436