diff options
| author | Matt Schatz <genius3000@g3k.solutions> | 2019-11-17 05:06:33 -0700 |
|---|---|---|
| committer | P. Powell <petpow@saberuk.com> | 2019-11-18 11:07:19 +0000 |
| commit | 43da9c32321aafb29a82e98a06bc0e139bb3864d (patch) | |
| tree | 250f2fdbc065b4d7a1107cef38e479ad9828a50a /src | |
| parent | 2ec7654267f8ad127653839ba9aaf369705e3026 (diff) | |
Allow options:casemapping to remain defined when using m_nationalchars.
Diffstat (limited to 'src')
| -rw-r--r-- | src/configreader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp index 782a80080..2a1da8fd8 100644 --- a/src/configreader.cpp +++ b/src/configreader.cpp @@ -368,7 +368,8 @@ void ServerConfig::Fill() throw CoreException("You must restart to change the server id"); std::string casemapping = options->getString("casemapping"); - if (!casemapping.empty() && casemapping != CaseMapping) + // Ignore this value if CaseMapping is set to something the core doesn't provide (i.e., m_nationalchars). + if (!casemapping.empty() && casemapping != CaseMapping && (CaseMapping == "ascii" || CaseMapping == "rfc1459")) throw CoreException("You must restart to change the server casemapping"); } |