paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

emails: Move support_email into a common context.

Browse Source
This commit is contained in:
Rishi Gupta
2017-06-10 01:25:44 -07:00
parent 056489c247
commit 15b967fc3e
8 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -631,8 +631,7 @@ def do_start_email_change_process(user_profile, new_email):
old_email = user_profile.email
user_profile.email = new_email
context = {'support_email': settings.ZULIP_ADMINISTRATOR,
'realm': user_profile.realm,
context = {'realm': user_profile.realm,
'old_email': old_email,
'new_email': new_email,
}
@@ -3053,8 +3052,7 @@ def do_send_confirmation_email(invitee, referrer, body):
`invitee` is a PreregistrationUser.
`referrer` is a UserProfile.
"""
context = {'referrer': referrer,
'support_email': settings.ZULIP_ADMINISTRATOR}
context = {'referrer': referrer}
if referrer.realm.is_zephyr_mirror_realm:
template_prefix = 'zerver/emails/invitation_mit'