diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-05 21:44:02 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-05 21:44:02 -0700 |
| commit | a05cfb6df5336aa0369e6b27294dae3c418a75c6 (patch) | |
| tree | 67e093e9b2bc7458cee1734988c0e50f06f350df /activeresource | |
| parent | 2f42433f0a9d777e2a8f5fa05370ba464823933c (diff) | |
| download | rails-a05cfb6df5336aa0369e6b27294dae3c418a75c6.tar.gz rails-a05cfb6df5336aa0369e6b27294dae3c418a75c6.tar.bz2 rails-a05cfb6df5336aa0369e6b27294dae3c418a75c6.zip | |
Prefer sibling Active Support
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/lib/active_resource.rb | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/activeresource/lib/active_resource.rb b/activeresource/lib/active_resource.rb index 2f0c8d1a8e..7a3faf445a 100644 --- a/activeresource/lib/active_resource.rb +++ b/activeresource/lib/active_resource.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' require 'active_resource/formats' |