From 16a0327c3311befe77a7e765dc50495544e3cffb Mon Sep 17 00:00:00 2001
From: fionabunny <steampunknancy@outlook.com>
Date: Wed, 26 Apr 2017 14:54:23 -0700
Subject: [PATCH] home.py: move emojiset to register_ret.

Moving the user_profile data section down into fetch_initial_state_data
so it entirely pulls from register_ret for #3853
---
 zerver/views/home.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zerver/views/home.py b/zerver/views/home.py
index f4aaeb1846..265e146004 100644
--- a/zerver/views/home.py
+++ b/zerver/views/home.py
@@ -222,7 +222,6 @@ def home_real(request):
         avatar_url_medium     = avatar_url(user_profile, medium=True),
         avatar_source         = user_profile.avatar_source,
         timezone              = user_profile.timezone,
-        emojiset              = user_profile.emojiset,
 
         # Stream message notification settings:
         stream_desktop_notifications_enabled = user_profile.enable_stream_desktop_notifications,
@@ -265,6 +264,7 @@ def home_real(request):
         'attachments',
         'default_language',
         'emoji_alt_code',
+        'emojiset',
         'emojiset_choices',
         'hotspots',
         'last_event_id',