diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-01-27 17:13:36 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-01-27 17:13:36 +0100 |
| commit | d6c831bd3d07a08e9d002fa047343f189f85637f (patch) | |
| tree | 32389de09e2b1cbe25221502d983b23c5a10c6f0 /synapse/storage/push_rule.py | |
| parent | Merge pull request #529 from matrix-org/dbkr/one_to_one_only_messages (diff) | |
| parent | Fix adding push rules relative to other rules (diff) | |
| download | synapse-d6c831bd3d07a08e9d002fa047343f189f85637f.tar.xz | |
Merge pull request #531 from matrix-org/markjh/relative_push_rules
Fix adding push rules relative to other rules
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, |