From 2f706d084fa0e9ef9a5a901a16e15d03e04968fb Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 5 Jun 2014 14:15:32 -0400 Subject: [PATCH] FIX: in import scripts, don't generate names for users based on their emails. It's basically the same as publicizing their emails. --- script/import_scripts/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/import_scripts/base.rb b/script/import_scripts/base.rb index 0996c352362..08614b35fd8 100644 --- a/script/import_scripts/base.rb +++ b/script/import_scripts/base.rb @@ -125,7 +125,7 @@ class ImportScripts::Base existing = User.where(email: opts[:email].downcase, username: opts[:username]).first return existing if existing and existing.custom_fields["import_id"].to_i == import_id.to_i - opts[:name] = User.suggest_name(opts[:name] || opts[:email]) + opts[:name] = User.suggest_name(opts[:name]) if opts[:name] opts[:username] = UserNameSuggester.suggest((opts[:username].present? ? opts[:username] : nil) || opts[:name] || opts[:email]) opts[:email] = opts[:email].downcase opts[:trust_level] = TrustLevel.levels[:basic] unless opts[:trust_level]