diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
| commit | 0aad5abcc8f3893dd0664b0813fa6815f7e43527 (patch) | |
| tree | 58dda47f27506dcdd04393d6a79a4efa90479075 /actionpack/lib | |
| parent | 02e382a765bea5632e56d80408ba20762e3ef334 (diff) | |
| download | rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.gz rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.bz2 rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.zip | |
AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 51db64bf44..340f41163d 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -26,8 +26,12 @@ $:.unshift(File.dirname(__FILE__)) begin require 'active_support' rescue LoadError - require 'rubygems' - require_gem 'activesupport' + begin + require File.dirname(__FILE__) + '/../../activesupport/lib/active_support' + rescue LoadError + require 'rubygems' + require_gem 'activesupport' + end end require 'action_controller/base' diff --git a/actionpack/lib/action_view.rb b/actionpack/lib/action_view.rb index 4caf9d8236..d2a54da15e 100644 --- a/actionpack/lib/action_view.rb +++ b/actionpack/lib/action_view.rb @@ -22,7 +22,7 @@ #++ begin - require 'rubygems' + require 'rubygems' require 'builder' rescue LoadError # RubyGems is not available, use included Builder |