Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0

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