Merge commit '8d0097bef' into anoa/dinsic_release_1_18_x

* commit '8d0097bef': Fix bug in per-room message retention policies. (#7850)
2020-08-03 17:31:29 -07:00
parent fd40a70ba8 8d0097bef1
commit dd659047f5
2 changed files with 2 additions and 1 deletions
@@ -0,0 +1 @@
+Fix "AttributeError: 'str' object has no attribute 'get'" error message when applying per-room message retention policies. The bug was introduced in Synapse 1.7.0.
@@ -939,7 +939,7 @@ class RoomBackgroundUpdateStore(SQLBaseStore):
                    retention_policy = {}
                else:
                    ev = json.loads(row["json"])
-                    retention_policy = json.dumps(ev["content"])
+                    retention_policy = ev["content"]

                self.db.simple_insert_txn(
                    txn=txn,
				`@@ -0,0 +1 @@`
				`Fix "AttributeError: 'str' object has no attribute 'get'" error message when applying per-room message retention policies. The bug was introduced in Synapse 1.7.0.`