diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
| commit | faee41c303c51f2d0ba9392643e67a8d100fbfa9 (patch) | |
| tree | a586ca2ca460de50eb37c301409ccd97f9f40abf /synapse/storage/_base.py | |
| parent | Filter room where the user has been banned (diff) | |
| parent | Fix bug where we didn't always get 'prev_content' key (diff) | |
| download | synapse-faee41c303c51f2d0ba9392643e67a8d100fbfa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
Diffstat (limited to 'synapse/storage/_base.py')
| -rw-r--r-- | synapse/storage/_base.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 8deaaf93bd..cf88bfc22b 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -315,6 +315,10 @@ class SQLBaseStore(object): d["content"] = json.loads(d["content"]) del d["unrecognized_keys"] + if "age_ts" not in d: + # For compatibility + d["age_ts"] = d["ts"] if "ts" in d else 0 + return self.event_factory.create_event( etype=d["type"], **d |