Merge branch 'master' into Develop

# Conflicts: # cps/helper.py
2020-05-10 19:24:55 +02:00
parent 308fd55483 92db00692a
commit 16a3deec2c
12 changed files with 412 additions and 391 deletions
@@ -1526,7 +1526,7 @@ def profile():
            current_user.kindle_mail = to_save["kindle_mail"]
        if "allowed_tags" in to_save and to_save["allowed_tags"] != current_user.allowed_tags:
            current_user.allowed_tags = to_save["allowed_tags"].strip()
-        if to_save["email"] and to_save["email"] != current_user.email:
+        if "email" in to_save and to_save["email"] != current_user.email:
            if config.config_public_reg and not check_valid_domain(to_save["email"]):
                flash(_(u"E-mail is not from valid domain"), category="error")
                return render_title_template("user_edit.html", content=current_user, downloads=downloads,