Bring in tryms Rails 3 fix as it preserves backwards compatibility.

Merge remote branch 'trym/master' into trym Conflicts: init.rb
ayb · Apr 5, 2010 · c14e9db · c14e9db
2 parents 08107e1 + b585179
commit c14e9db
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/init.rb b/init.rb
@@ -1,3 +1,7 @@
-if Rails.env.production?
-  Rails::Application.middleware.use Hassle
+if (defined? Rails.env ? Rails.env : RAILS_ENV) == "production"
+  if defined? Rails.configuration && defined? Rails.configuration.middleware
+    Rails.configuration.middleware.use(Hassle)
+  elsif defined? ActionController::Dispatcher && defined? ActionController::Dispatcher.middleware
+    ActionController::Dispatcher.middleware.use Hassle
+  end  
 end