Merge branch 'master' into openstreetbugs

[rails.git] / vendor / plugins / http_accept_language / init.rb

diff --git a/vendor/plugins/http_accept_language/init.rb b/vendor/plugins/http_accept_language/init.rb
index 67e2687e3f2e438ae6aefc065b619439b0a30d33..050a7ca5640995ed026063a0028b10356b4dc497 100644 (file)
--- a/vendor/plugins/http_accept_language/init.rb
+++ b/vendor/plugins/http_accept_language/init.rb
@@ -1,4 +1,6 @@
-if defined?(ActionController::Request)
+if defined?(ActionDispatch::Request)
+  ActionDispatch::Request.send :include, HttpAcceptLanguage
+elsif defined?(ActionController::Request)
   ActionController::Request.send :include, HttpAcceptLanguage
 elsif defined?(ActionController::AbstractRequest)
   ActionController::AbstractRequest.send :include, HttpAcceptLanguage