diff options
| author | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
| commit | 0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2 (patch) | |
| tree | 1a782151632dd80c8a18c3960536bdf8643debe3 /actionpack/lib/action_controller.rb | |
| parent | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (diff) | |
| parent | 229eedfda87a7706dbb5e3e51af8707b3adae375 (diff) | |
| download | rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.gz rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.bz2 rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rw-r--r--[-rwxr-xr-x] | actionpack/lib/action_controller.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 3c4a339d50..e58071d4af 100755..100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -21,16 +21,13 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ -$:.unshift(File.dirname(__FILE__)) unless - $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__))) - -unless defined?(ActiveSupport) - begin - $:.unshift "#{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' - rescue LoadError - require 'rubygems' - gem 'activesupport' end end |