diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
| commit | d3042ef80c4406c90ff1e120059a99784d8ae79f (patch) | |
| tree | a779b4fced3fd546d7c7c855fee41f3d996afba0 /activerecord/lib | |
| parent | d522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff) | |
| parent | eb201e64c0b68aee6d0715d44cf48178204c4133 (diff) | |
| download | rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2 rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index da2a528fd2..cf0557101f 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -21,15 +21,9 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -begin - require 'active_support' -rescue LoadError - activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" - if File.directory?(activesupport_path) - $:.unshift activesupport_path - require 'active_support' - end -end +activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib" +$:.unshift(activesupport_path) if File.directory?(activesupport_path) +require 'active_support' require 'active_support/core/all' $:.unshift(File.dirname(__FILE__) + '/../../arel/lib') |