Merge branch 'master' into devel

247c3442 · Martin Mareš · e02824ea · 38438c0b · 247c3442
Commit 247c3442 authored Sep 15, 2022 by Martin Mareš
--- a/mo/web/acct.py
+++ b/mo/web/acct.py
@@ -624,7 +624,7 @@ def confirm_email():
            flash('Požadavek na změnu e-mailu zrušen.', 'success')
        return redirect(url_for('user_settings'))
-    form.orig_email.data = self.user.email
+    form.orig_email.data = g.user.email
    form.new_email.data = reg2.rr.email
    return render_template('acct_confirm_email.html', form=form)