Skip to content
Snippets Groups Projects
Commit 6f679cac authored by Martin Mareš's avatar Martin Mareš
Browse files

Merge branch 'master' into devel

parents 247c3442 038d4341
Branches
No related tags found
No related merge requests found
...@@ -624,7 +624,7 @@ def confirm_email(): ...@@ -624,7 +624,7 @@ def confirm_email():
flash('Požadavek na změnu e-mailu zrušen.', 'success') flash('Požadavek na změnu e-mailu zrušen.', 'success')
return redirect(url_for('user_settings')) return redirect(url_for('user_settings'))
form.orig_email.data = g.user.email form.orig_email.data = reg2.rr.user.email
form.new_email.data = reg2.rr.email form.new_email.data = reg2.rr.email
return render_template('acct_confirm_email.html', form=form) return render_template('acct_confirm_email.html', form=form)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment