Mercurial > hg > soundsoftware-site
annotate .svn/pristine/b7/b71d26113de106cfa8f53a03df10400eb394a685.svn-base @ 1298:4f746d8966dd redmine_2.3_integration
Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author | Chris Cannam |
---|---|
date | Fri, 14 Jun 2013 09:28:30 +0100 |
parents | cbb26bc654de |
children |
rev | line source |
---|---|
Chris@909 | 1 module OpenIdAuthentication |
Chris@909 | 2 module Request |
Chris@909 | 3 def self.included(base) |
Chris@909 | 4 base.alias_method_chain :request_method, :openid |
Chris@909 | 5 end |
Chris@909 | 6 |
Chris@909 | 7 def request_method_with_openid |
Chris@909 | 8 if !parameters[:_method].blank? && parameters[:open_id_complete] == '1' |
Chris@909 | 9 parameters[:_method].to_sym |
Chris@909 | 10 else |
Chris@909 | 11 request_method_without_openid |
Chris@909 | 12 end |
Chris@909 | 13 end |
Chris@909 | 14 end |
Chris@909 | 15 end |
Chris@909 | 16 |
Chris@909 | 17 # In Rails 2.3, the request object has been renamed |
Chris@909 | 18 # from AbstractRequest to Request |
Chris@909 | 19 if defined? ActionController::Request |
Chris@909 | 20 ActionController::Request.send :include, OpenIdAuthentication::Request |
Chris@909 | 21 else |
Chris@909 | 22 ActionController::AbstractRequest.send :include, OpenIdAuthentication::Request |
Chris@909 | 23 end |