Download as
Browse Code »

Commit a7948d54e6b1320da244b2883823d425e207a875

Authored by Victor Costa
2 parents 35f0b393 e8f6202d
Exists in staging and in 7 other branches angular_poc, api-article-archived, api-homepage, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email

Merge branch 'oauth_rails3' into stable

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
plugins/oauth_client/lib/oauth_client_plugin.rb
  Diff comments   View file @a7948d5
... ... @@ -56,7 +56,8 @@ class OauthClientPlugin < Noosfero::Plugin
56 56 domain = Domain.find_by_name(request.host)
57 57 environment = domain.environment rescue Environment.default
58 58  
59   - provider_id = request.session['omniauth.params'] ? request.session['omniauth.params']['id'] : request.params['id']
  59 + provider_id = request.params['id']
  60 + provider_id ||= request.session['omniauth.params']['id'] if request.session['omniauth.params']
60 61 provider = environment.oauth_providers.find(provider_id)
61 62 strategy.options.merge!(provider.options.symbolize_keys)
62 63  
... ...