Fix a bad merge from release-v1.20.0. (#8354)

2020-09-18 12:54:04 -04:00 · 2020-09-18 12:54:04 -04:00 · babc027543
parent 00db7786de
commit babc027543
2 changed files with 2 additions and 1 deletions
--- a/changelog.d/8354.misc
+++ b/changelog.d/8354.misc
@ -0,0 +1 @@
+Fix bad merge from `release-v1.20.0` branch to `develop`.
--- 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
				`@ -0,0 +1 @@`
				Fix bad merge from `release-v1.20.0` branch to `develop`.