Merge pull request #4747 from matrix-org/anoa/public_rooms_federate dinsic_2019-02-26

[DINSIC] Prevent showing non-fed rooms in fed /publicRooms

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py

index 7288d49074..6d4a26f595 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -697,7 +697,8 @@ class PublicRoomList(BaseFederationServlet):
 
         data = yield self.handler.get_local_public_room_list(
             limit, since_token,
-            network_tuple=network_tuple
+            network_tuple=network_tuple,
+            from_federation=True,
         )
         defer.returnValue((200, data))