diff options
| author | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-01-29 13:52:12 +0000 |
| commit | fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2 (patch) | |
| tree | fd4650925097b4014e8ce32619ab4956a0a89879 /synapse/storage/push_rule.py | |
| parent | Bump version and changelog (diff) | |
| parent | Bump AccountDataAndTagsChangeCache size (diff) | |
| download | synapse-fd142c29d9af53fe76dcf0cb4e1ebe7aac5d28f2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1
Diffstat (limited to 'synapse/storage/push_rule.py')
| -rw-r--r-- | synapse/storage/push_rule.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 1f51c90ee5..f9a48171ba 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -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, |