diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-01-27 12:29:47 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-01-27 12:29:47 -0500 |
| commit | 8b71d1700a85949d2a17f6bd4d058bd1c1e34f7b (patch) | |
| tree | bba0ef7e44dddbcce5863bfe5cb77f8dc52e64de | |
| parent | d2a1950d3c9f074b9b846b471968728a98dd44cf (diff) | |
| parent | 5c27aff06ffecc249edcdc6cc9d6daea8f137add (diff) | |
| download | chat-8b71d1700a85949d2a17f6bd4d058bd1c1e34f7b.tar.gz chat-8b71d1700a85949d2a17f6bd4d058bd1c1e34f7b.tar.bz2 chat-8b71d1700a85949d2a17f6bd4d058bd1c1e34f7b.zip | |
Merge pull request #1999 from mattermost/plt-1700
PLT-1700 Only set store preferences if not null in head.html
| -rw-r--r-- | web/templates/head.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index 257877376..b1ec905b5 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -77,7 +77,9 @@ window.mm_preferences = {{ .Preferences }}; $(function() { - PreferenceStore.setPreferences(window.mm_preferences); + if (window.mm_preferences != null) { + PreferenceStore.setPreferences(window.mm_preferences); + } }); if ({{.SessionTokenIndex}} >= 0) { |