Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-08 17:22:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup

Browse source
This commit is contained in:
Erik Johnston 2016-01-27 17:22:35 +00:00
commit a955cbfa49
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/push_rule.py
View file

@ -130,7 +130,8 @@ class PushRuleStore(SQLBaseStore):
def _add_push_rule_relative_txn(self, txn, user_id, **kwargs):
after = kwargs.pop("after", None)
relative_to_rule = kwargs.pop("before", after)
before = kwargs.pop("before", None)
relative_to_rule = before or after
res = self._simple_select_one_txn(
txn,