From b2850e62db376ea920fed9dff65a47c15cb0dc68 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 6 Jan 2017 23:22:44 +0000 Subject: [PATCH 1/2] fix typo breaking the fix to #1753 --- synapse/events/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 8c71aeb5e..da9f3ad43 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -43,7 +43,7 @@ class _EventInternalMetadata(object): returns a str with the name of the server this event is sent on behalf of. """ - return getattr(self, "get_send_on_behalf_of", None) + return getattr(self, "send_on_behalf_of", None) def _event_dict_property(key): From 8404f132c3fec8ca80184fe86302d653aac164ea Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 6 Jan 2017 23:28:46 +0000 Subject: [PATCH 2/2] Revert "fix typo breaking the fix to #1753" This reverts commit b2850e62db376ea920fed9dff65a47c15cb0dc68. --- synapse/events/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index da9f3ad43..8c71aeb5e 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -43,7 +43,7 @@ class _EventInternalMetadata(object): returns a str with the name of the server this event is sent on behalf of. """ - return getattr(self, "send_on_behalf_of", None) + return getattr(self, "get_send_on_behalf_of", None) def _event_dict_property(key):