From bf0375d51d17d0c5992da47e7888002c562728fd Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 28 Aug 2022 15:59:25 +0200 Subject: [PATCH] Bugfix change emails --- cps/admin.py | 4 ++-- cps/web.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cps/admin.py b/cps/admin.py index d47bfc3f..b70beab5 100755 --- a/cps/admin.py +++ b/cps/admin.py @@ -1960,11 +1960,11 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support): if to_save.get("locale"): content.locale = to_save["locale"] try: - new_email = check_email(to_save.get("email", content.email)) + new_email = valid_email(to_save.get("email", content.email)) if not new_email: raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail")) if new_email != content.email: - content.email = new_email + content.email = check_email(new_email) # Query username, if not existing, change if to_save.get("name", content.name) != content.name: if to_save.get("name") == "Guest": diff --git a/cps/web.py b/cps/web.py index cbfa50c4..579d388a 100755 --- a/cps/web.py +++ b/cps/web.py @@ -1364,11 +1364,11 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations, try: if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail: current_user.kindle_mail = valid_email(to_save.get("kindle_mail")) - new_email = check_email(to_save.get("email", current_user.email)) + new_email = valid_email(to_save.get("email", current_user.email)) if not new_email: raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail")) if new_email != current_user.email: - current_user.email = new_email + current_user.email = check_email(new_email) if current_user.role_admin(): if to_save.get("name", current_user.name) != current_user.name: # Query username, if not existing, change