diff options
| author |  Sadie Powell | 2019-07-16 15:11:21 +0100 |
|---|---|---|
| committer | Sadie Powell | 2019-07-16 16:48:18 +0100 |
| commit | cd8b456f979733525941284639d8bf899173b429 (patch) | |
| tree | f1d26962e61c74c5acb076662a909beafbe8e5fd /src/channels.cpp | |
| parent | Replace socketengine_{pthread,win32} with C++11 threads. (diff) | |
| parent | ssl_gnutls: remove PackageInfo directives for EOL Debian versions. (diff) | |
| download | inspircd++-cd8b456f979733525941284639d8bf899173b429.tar.gz inspircd++-cd8b456f979733525941284639d8bf899173b429.tar.bz2 inspircd++-cd8b456f979733525941284639d8bf899173b429.zip | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 4b08810f4..4b979c0cb 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -268,8 +268,8 @@ Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursti if (privs) { - // If the user was granted prefix modes (in the OnUserPreJoin hook, or he's a - // remote user and his own server set the modes), then set them internally now + // If the user was granted prefix modes (in the OnUserPreJoin hook, or they're a + // remote user and their own server set the modes), then set them internally now for (std::string::const_iterator i = privs->begin(); i != privs->end(); ++i) { PrefixMode* mh = ServerInstance->Modes.FindPrefixMode(*i); |