Merge issue fixed

2012-08-24 15:40:44 +02:00 · 2012-08-24 15:40:44 +02:00 · 36ffdf36b9
parent 48443d20ca
commit 36ffdf36b9
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@ -33,7 +33,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController

    if current_user
      # Change a logged-in user's authentication method:
-      current_user.uid = uid
+      current_user.extern_uid = uid
      current_user.provider = provider
      current_user.save
      redirect_to profile_path