github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: avatar_url should only be a custom field

Browse Source
This commit is contained in:
Régis Hanol
2014-08-14 09:43:32 +02:00
parent 8dc5429ccc
commit 61842157bf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
script/import_scripts/base.rb
View File

@ -232,6 +232,8 @@ class ImportScripts::Base
return existing if existing && existing.custom_fields["import_id"].to_i == import_id.to_i return existing if existing && existing.custom_fields["import_id"].to_i == import_id.to_i
bio_raw = opts.delete(:bio_raw) bio_raw = opts.delete(:bio_raw)
avatar_url = opts.delete(:avatar_url)
opts[:name] = User.suggest_name(opts[:email]) unless opts[:name] opts[:name] = User.suggest_name(opts[:email]) unless opts[:name]
if opts[:username].blank? || !User.username_available?(opts[:username]) if opts[:username].blank? || !User.username_available?(opts[:username])
opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name] || opts[:email]) opts[:username] = UserNameSuggester.suggest(opts[:username] || opts[:name] || opts[:email])
@ -244,7 +246,7 @@ class ImportScripts::Base
u = User.new(opts) u = User.new(opts)
u.custom_fields["import_id"] = import_id u.custom_fields["import_id"] = import_id
u.custom_fields["import_username"] = opts[:username] if opts[:username].present? u.custom_fields["import_username"] = opts[:username] if opts[:username].present?
u.custom_fields["import_avatar_url"] = opts[:avatar_url] if opts[:avatar_url].present? u.custom_fields["import_avatar_url"] = avatar_url if avatar_url.present?
begin begin
User.transaction do User.transaction do