Modified: trunk/vendor/plugins/oauth/lib/oauth/request_proxy/action_controller_request.rb (2865 => 2866)
--- trunk/vendor/plugins/oauth/lib/oauth/request_proxy/action_controller_request.rb 2011-12-06 10:49:24 UTC (rev 2865)
+++ trunk/vendor/plugins/oauth/lib/oauth/request_proxy/action_controller_request.rb 2011-12-06 10:53:19 UTC (rev 2866)
@@ -7,8 +7,12 @@
module OAuth::RequestProxy
class ActionControllerRequest < OAuth::RequestProxy::Base
- proxies ActionController::AbstractRequest
-
+ if ActionController.const_defined?(:AbstractRequest)
+ proxies ActionController::AbstractRequest
+ else
+ proxies ActionController::Request
+ end
+
def method
request.method.to_s.upcase
end