summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-14 14:16:41 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-14 14:16:41 +0000
commit398cd1edfbefa207e44047bd63adcdcc6e859f2e (patch)
treeba196ebb4f83dd936661e96b0bcf8f8c5fe8209a /synapse/rest/client
parentMerge pull request #642 from matrix-org/erikj/logout (diff)
downloadsynapse-398cd1edfbefa207e44047bd63adcdcc6e859f2e.tar.xz
Fix regression where synapse checked whether push rules were valid JSON before the compatibility hack that handled clients sending invalid JSON
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/push_rule.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py
index b5695d427a..02d837ee6a 100644
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@@ -25,7 +25,7 @@ from synapse.storage.push_rule import (
 from synapse.push.clientformat import format_push_rules_for_user
 from synapse.push.baserules import BASE_RULE_IDS
 from synapse.push.rulekinds import PRIORITY_CLASS_MAP
-from synapse.http.servlet import parse_json_object_from_request
+from synapse.http.servlet import parse_json_value_from_request
 
 
 class PushRuleRestServlet(ClientV1RestServlet):
@@ -51,7 +51,7 @@ class PushRuleRestServlet(ClientV1RestServlet):
         if '/' in spec['rule_id'] or '\\' in spec['rule_id']:
             raise SynapseError(400, "rule_id may not contain slashes")
 
-        content = parse_json_object_from_request(request)
+        content = parse_json_value_from_request(request)
 
         user_id = requester.user.to_string()