Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Erik Johnston 2015-04-07 18:08:38 +01:00
parent 4fe95094d1 a2a93a4fa7
commit 38928c6609
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/start.sh
View File

@ -34,7 +34,7 @@ for port in 8080 8081 8082; do
--tls-dh-params-path "demo/demo.tls.dh" \ --tls-dh-params-path "demo/demo.tls.dh" \
--media-store-path "demo/media_store.$port" \ --media-store-path "demo/media_store.$port" \
$PARAMS $SYNAPSE_PARAMS \ $PARAMS $SYNAPSE_PARAMS \
--disable-registration false --enable-registration
python -m synapse.app.homeserver \ python -m synapse.app.homeserver \
--config-path "demo/etc/$port.config" \ --config-path "demo/etc/$port.config" \

2
synapse/api/auth.py
View File

@ -486,7 +486,7 @@ class Auth(object):
send_level = send_level_event.content.get("events", {}).get( send_level = send_level_event.content.get("events", {}).get(
event.type event.type
) )
if not send_level: if send_level is None:
if hasattr(event, "state_key"): if hasattr(event, "state_key"):
send_level = send_level_event.content.get( send_level = send_level_event.content.get(
"state_default", 50 "state_default", 50