diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-23 01:09:27 +0100 |
| commit | 5a1fe9039b33414b7088813712e03bbe38567cff (patch) | |
| tree | 10e3a15c06494dd09c0324dca894ddcbb68ce582 /activemodel | |
| parent | 3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff) | |
| parent | 7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff) | |
| download | rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2 rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/lib/active_model/core.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/activemodel/lib/active_model/core.rb b/activemodel/lib/active_model/core.rb index 47b968e121..6b2bee53d9 100644 --- a/activemodel/lib/active_model/core.rb +++ b/activemodel/lib/active_model/core.rb @@ -1,7 +1,12 @@ -# This file is required by each major ActiveModel component for the core requirements. This allows you to -# load individual pieces of ActiveModel as needed. -$LOAD_PATH << File.join(File.dirname(__FILE__), '..', '..', '..', 'activesupport', 'lib') +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 -# premature optimization? # So far, we only need the string inflections and not the rest of ActiveSupport. -require 'active_support/inflector'
\ No newline at end of file +require 'active_support/inflector' |