diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-09-20 18:39:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 18:39:10 +0200 |
| commit | 2e2944e6e632291bd3bdf8daec956208f780db2c (patch) | |
| tree | 5e324075df4536cfe657bc8d208382a788e3b011 /src/channels.cpp | |
| parent | fcd538761adad5834c0b6c4c14b43bea9f8bfd6d (diff) | |
| parent | caded702bf11d677c1a163da9055888eb06e1fe6 (diff) | |
Merge pull request #1226 from SaberUK/master+fix-insp20-channels-compat
Fix compatibility with the legacy <channels> tag.
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 49fa75f98..bc23c680a 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -181,7 +181,7 @@ Channel* Channel::JoinUser(LocalUser* user, std::string cname, bool override, co { unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans")); // If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC - if (!opermaxchans) + if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit")) opermaxchans = ServerInstance->Config->OperMaxChans; if (opermaxchans) maxchans = opermaxchans; |