IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Associated Instagram account was missing at some places

Browse Source
This commit is contained in:
Gerhard Schlager
2018-03-01 12:10:27 +01:00
parent 7ae1c5a663
commit fffd1a6602
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@@ -61,6 +61,7 @@ class User < ActiveRecord::Base
has_one :github_user_info, dependent: :destroy
has_one :google_user_info, dependent: :destroy
has_one :oauth2_user_info, dependent: :destroy
has_one :instagram_user_info, dependent: :destroy
has_one :user_second_factor, dependent: :destroy
has_one :user_stat, dependent: :destroy
has_one :user_profile, dependent: :destroy, inverse_of: :user
@@ -887,7 +888,8 @@ class User < ActiveRecord::Base
result << "Twitter(#{twitter_user_info.screen_name})" if twitter_user_info
result << "Facebook(#{facebook_user_info.username})" if facebook_user_info
result << "Google(#{google_user_info.email})" if google_user_info
result << "Github(#{github_user_info.screen_name})" if github_user_info
result << "GitHub(#{github_user_info.screen_name})" if github_user_info
result << "Instagram(#{instagram_user_info.screen_name})" if instagram_user_info
result << "#{oauth2_user_info.provider}(#{oauth2_user_info.email})" if oauth2_user_info
user_open_ids.each do |oid|