mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 22:00:22 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into mysql
This commit is contained in:
commit
38928c6609
2 changed files with 2 additions and 2 deletions
|
@ -34,7 +34,7 @@ for port in 8080 8081 8082; do
|
|||
--tls-dh-params-path "demo/demo.tls.dh" \
|
||||
--media-store-path "demo/media_store.$port" \
|
||||
$PARAMS $SYNAPSE_PARAMS \
|
||||
--disable-registration false
|
||||
--enable-registration
|
||||
|
||||
python -m synapse.app.homeserver \
|
||||
--config-path "demo/etc/$port.config" \
|
||||
|
|
|
@ -486,7 +486,7 @@ class Auth(object):
|
|||
send_level = send_level_event.content.get("events", {}).get(
|
||||
event.type
|
||||
)
|
||||
if not send_level:
|
||||
if send_level is None:
|
||||
if hasattr(event, "state_key"):
|
||||
send_level = send_level_event.content.get(
|
||||
"state_default", 50
|
||||
|
|
Loading…
Reference in a new issue