diff options
| author | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-05 18:39:50 +0000 |
| commit | eb036256267dc76f13a8a25ab952356e1b1e9c00 (patch) | |
| tree | 6d91ca8882e7afc8c5486e28d2e782783b1c85de /synapse/handlers/message.py | |
| parent | comment typo (diff) | |
| parent | Merge pull request #463 from matrix-org/daniel/hashtagnofilter (diff) | |
| download | synapse-eb036256267dc76f13a8a25ab952356e1b1e9c00.tar.xz | |
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a1bed9b0dc..5805190ce8 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2014, 2015 OpenMarket Ltd +# Copyright 2014 - 2016 OpenMarket Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -685,7 +685,7 @@ class MessageHandler(BaseHandler): ).addErrback(unwrapFirstError) messages = yield self._filter_events_for_client( - user_id, messages, is_guest=is_guest, require_all_visible_for_guests=False + user_id, messages, is_guest=is_guest, ) start_token = now_token.copy_and_replace("room_key", token[0]) |