From babc0275431c68e64050db11959d74a636afbd3e Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clokep@users.noreply.github.com>
Date: Fri, 18 Sep 2020 12:54:04 -0400
Subject: [PATCH] Fix a bad merge from release-v1.20.0. (#8354)
---
changelog.d/8354.misc | 1 +
synapse/handlers/pagination.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 changelog.d/8354.misc
diff --git a/changelog.d/8354.misc b/changelog.d/8354.misc
new file mode 100644
index 0000000000..1d33cde2da
--- /dev/null
+++ b/changelog.d/8354.misc
@@ -0,0 +1 @@
+Fix bad merge from `release-v1.20.0` branch to `develop`.
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py
index f132ed3368..a0b3bdb5e0 100644
--- a/synapse/handlers/pagination.py
+++ b/synapse/handlers/pagination.py
@@ -385,7 +385,7 @@ class PaginationHandler:
)
await self.hs.get_handlers().federation_handler.maybe_backfill(
- room_id, curr_topo, limit=source_config.limit,
+ room_id, curr_topo, limit=pagin_config.limit,
)
to_room_key = None
--
GitLab