Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

2016-12-06 11:46:45 +01:00 · 2016-12-06 11:46:45 +01:00 · d675730cdb
parent 6dc1e9ae80 ba88e14001
commit d675730cdb
1 changed files with 1 additions and 0 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -786,6 +786,7 @@ returns
  end

  def check_email
+    return if Setting.get('import_mode')
    return if email.empty?
    self.email = email.downcase.strip
    return if id == 1