summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-02-26 13:20:38 +0000
committerGitHub <noreply@github.com>2019-02-26 13:20:38 +0000
commitc74624a633ae883474a5ec3137bddd009165144c (patch)
tree0e810f5eddc0ea1fe93059a6a7d5104d11530b09 /synapse/federation
parentMerge pull request #4736 from matrix-org/anoa/public_rooms_federate (diff)
downloadsynapse-c74624a633ae883474a5ec3137bddd009165144c.tar.xz
Revert "Prevent showing non-fed rooms in fed /publicRooms"
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/server.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 5ba94be2ec..a2396ab466 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -736,8 +736,7 @@ class PublicRoomList(BaseFederationServlet):
 
         data = yield self.handler.get_local_public_room_list(
             limit, since_token,
-            network_tuple=network_tuple,
-            from_federation=True,
+            network_tuple=network_tuple
         )
         defer.returnValue((200, data))