paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-09 08:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

home.py: move emojiset to register_ret.

Browse Source 
Moving the user_profile data section down into fetch_initial_state_data
so it entirely pulls from register_ret for #3853
This commit is contained in:
fionabunny
2017-04-26 14:54:23 -07:00
committed by Tim Abbott
parent 2bdb6a00a7
commit 16a0327c33
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/views/home.py
View File

@@ -222,7 +222,6 @@ def home_real(request):
avatar_url_medium = avatar_url(user_profile, medium=True), avatar_url_medium = avatar_url(user_profile, medium=True),
avatar_source = user_profile.avatar_source, avatar_source = user_profile.avatar_source,
timezone = user_profile.timezone, timezone = user_profile.timezone,
emojiset = user_profile.emojiset,
# Stream message notification settings: # Stream message notification settings:
stream_desktop_notifications_enabled = user_profile.enable_stream_desktop_notifications, stream_desktop_notifications_enabled = user_profile.enable_stream_desktop_notifications,
@@ -265,6 +264,7 @@ def home_real(request):
'attachments', 'attachments',
'default_language', 'default_language',
'emoji_alt_code', 'emoji_alt_code',
'emojiset',
'emojiset_choices', 'emojiset_choices',
'hotspots', 'hotspots',
'last_event_id', 'last_event_id',