mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-12-25 11:49:22 -05:00
b74606ea22
Fixes a bug where the default attribute maps were prioritised over user-specified ones, resulting in incorrect mappings. The problem is that if you call SPConfig.load() multiple times, it adds new attribute mappers to a list. So by calling it with the default config first, and then the user-specified config, we would always get the default mappers before the user-specified mappers. To solve this, let's merge the config dicts first, and then pass them to SPConfig. |
||
|---|---|---|
| .. | ||
| caches | ||
| __init__.py | ||
| async_helpers.py | ||
| distributor.py | ||
| file_consumer.py | ||
| frozenutils.py | ||
| httpresourcetree.py | ||
| jsonobject.py | ||
| logcontext.py | ||
| logformatter.py | ||
| manhole.py | ||
| metrics.py | ||
| module_loader.py | ||
| msisdn.py | ||
| ratelimitutils.py | ||
| retryutils.py | ||
| rlimit.py | ||
| stringutils.py | ||
| threepids.py | ||
| versionstring.py | ||
| wheel_timer.py | ||