diff .svn/pristine/b7/b71d26113de106cfa8f53a03df10400eb394a685.svn-base @ 927:9ee5fd0b9bd3

Merge from cannam_integration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/b7/b71d26113de106cfa8f53a03df10400eb394a685.svn-base	Fri May 11 16:13:59 2012 +0100
@@ -0,0 +1,23 @@
+module OpenIdAuthentication
+  module Request
+    def self.included(base)
+      base.alias_method_chain :request_method, :openid
+    end
+
+    def request_method_with_openid
+      if !parameters[:_method].blank? && parameters[:open_id_complete] == '1'
+        parameters[:_method].to_sym
+      else
+        request_method_without_openid
+      end
+    end
+  end
+end
+
+# In Rails 2.3, the request object has been renamed
+# from AbstractRequest to Request
+if defined? ActionController::Request
+  ActionController::Request.send :include, OpenIdAuthentication::Request
+else
+  ActionController::AbstractRequest.send :include, OpenIdAuthentication::Request
+end