summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
commitf5cf7ac25b311fda8a2d553f07437b3648c66f6c (patch)
tree62d43c8acf91281f59239f331745e9796a0f827e /synapse/storage/_base.py
parentSPEC-7: Don't stamp event contents with 'hsob_ts' (diff)
downloadsynapse-f5cf7ac25b311fda8a2d553f07437b3648c66f6c.tar.xz
SPEC-7: Rename 'ts' to 'origin_server_ts'
Diffstat (limited to 'synapse/storage/_base.py')
-rw-r--r--synapse/storage/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py

index dba50f1213..30c5103cdd 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py
@@ -361,7 +361,7 @@ class SQLBaseStore(object): if "age_ts" not in d: # For compatibility - d["age_ts"] = d["ts"] if "ts" in d else 0 + d["age_ts"] = d["origin_server_ts"] if "origin_server_ts" in d else 0 return self.event_factory.create_event( etype=d["type"],