summary refs log tree commit diff
path: root/synapse/storage/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-04-16 11:17:52 +0100
committerErik Johnston <erik@matrix.org>2015-04-16 11:17:52 +0100
commitb8092fbc82edb3c7d8aa09f0756fa853ad6a6ad8 (patch)
tree57fad9f09c102550fdbad7ac047ec02eb6a24283 /synapse/storage/profile.py
parentMove encoding and decoding of JSON into storage layer (diff)
downloadsynapse-b8092fbc82edb3c7d8aa09f0756fa853ad6a6ad8.tar.xz
Go back to storing JSON in TEXT
Diffstat (limited to 'synapse/storage/profile.py')
-rw-r--r--synapse/storage/profile.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/storage/profile.py b/synapse/storage/profile.py
index e33963d0b4..047698aa13 100644
--- a/synapse/storage/profile.py
+++ b/synapse/storage/profile.py
@@ -35,16 +35,13 @@ class ProfileStore(SQLBaseStore):
             desc="get_profile_displayname",
         )
 
-        if name:
-            name = self.database_engine.load_unicode(name)
-
         defer.returnValue(name)
 
     def set_profile_displayname(self, user_localpart, new_displayname):
         return self._simple_update_one(
             table="profiles",
             keyvalues={"user_id": user_localpart},
-            updatevalues={"displayname": new_displayname.encode("utf8")},
+            updatevalues={"displayname": new_displayname},
             desc="set_profile_displayname",
         )