diff options
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 9 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_view.rb | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record.rb | 8 |
4 files changed, 19 insertions, 8 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 48fe4ccb16..a8157824ef 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -24,9 +24,12 @@ begin require 'action_controller' rescue LoadError - # Action Pack is not already available, try RubyGems - require 'rubygems' - require_gem 'actionpack', '>= 0.9.0' + begin + require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller' + rescue LoadError + require 'rubygems' + require_gem 'actionpack', '>= 0.9.0' + end end $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/") 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 diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 0541413625..04d16b41f3 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -27,8 +27,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 'active_record/base' |