Merge branch 'release_20.09' into release_21.01

2026-09-24 16:30:27 +08:00 · 2021-03-23 17:24:10 +01:00
parent d6b16b43e5 4bc8b9a868
commit 1ffd226625
1 changed files with 1 additions and 1 deletions
@@ -398,7 +398,7 @@ class User(Dictifiable, RepresentById):
        extra_user_preferences = self.preferences.get('extra_user_preferences')
        if extra_user_preferences:
            try:
-                data = json.loads(extra_user_preferences)
+                data.update(json.loads(extra_user_preferences))
            except Exception:
                pass
        return data