diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
| commit | 704e7e9f44bb6ac4de03e47fd9276396d3c00af9 (patch) | |
| tree | 2b3f49347cb9615bdacf276a8b786243aa16d324 /synapse/storage/_base.py | |
| parent | freenode verification (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 (diff) | |
| download | synapse-704e7e9f44bb6ac4de03e47fd9276396d3c00af9.tar.xz | |
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0
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 |