diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-12-02 19:51:47 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-12-02 19:51:47 +0000 |
| commit | 5da65085d106e98cf7b762836cb300d01226bf92 (patch) | |
| tree | a6de5abe0e3485800f382221e861961578a82d2f /synapse/http | |
| parent | Write the upload portion of version 1 of the media repository (diff) | |
| download | synapse-5da65085d106e98cf7b762836cb300d01226bf92.tar.xz | |
Get uploads working with new media repo
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 046e230361..02277c4998 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -201,9 +201,9 @@ class RootRedirect(resource.Resource): def respond_with_json(request, code, json_object, send_cors=False, response_code_message=None, pretty_print=False): if not pretty_print: - json_bytes = encode_pretty_printed_json(response_json_object) + json_bytes = encode_pretty_printed_json(json_object) else: - json_bytes = encode_canonical_json(response_json_object) + json_bytes = encode_canonical_json(json_object) return respond_with_json_bytes(request, code, json_bytes, send_cors, response_code_message=response_code_message) |