@@ -275,9 +275,9 @@ private if !defined?(Dispatcher) require 'dispatcher' end - if File.exist?('app/controllers/application_controller.rb') + begin require_dependency 'application_controller' - else + rescue LoadError require_dependency 'application' end lib/phusion_passenger/railz/application_spawner.rb 860561486866025bce36d12e397331649bfdb37c Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/d26f5cb3487a7df2f6bfeedc8f1b4489f9008032 d26f5cb3487a7df2f6bfeedc8f1b4489f9008032 2009-04-08T06:17:40-07:00 2009-04-08T06:17:40-07:00 Make it possible to load application_controller.rb even if it doesn't live in app/controllers. Fixes bug #206. 93eafba24dd13f7e62afcdc86091dd1c6f19c408 Hongli Lai (Phusion) hongli@phusion.nl