aboutsummaryrefslogtreecommitdiffstats
path: root/src/channels.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2019-02-05 00:47:30 +0000
committerGravatar Sadie Powell2019-02-05 00:47:30 +0000
commitbfa5fb407e13ad4adb5c062021de50ecd760ed95 (patch)
treec573269b1a94fd7e7da27c1b90b05fa60916de23 /src/channels.cpp
parentRemove support for the deprecated <power> config tag. (diff)
parentModuleManager: use std::flush instead of fflush(stdout). (diff)
downloadinspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.tar.gz
inspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.tar.bz2
inspircd++-bfa5fb407e13ad4adb5c062021de50ecd760ed95.zip
Merge branch 'insp3' into master.
Diffstat (limited to 'src/channels.cpp')
-rw-r--r--src/channels.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/channels.cpp b/src/channels.cpp
index 4b56527c9..4f290f47f 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -433,7 +433,7 @@ void Channel::Write(ClientProtocol::Event& protoev, char status, const CUList& e
}
}
-const char* Channel::ChanModes(bool showkey)
+const char* Channel::ChanModes(bool showsecret)
{
static std::string scratch;
std::string sparam;
@@ -452,9 +452,9 @@ const char* Channel::ChanModes(bool showkey)
if (!pm)
continue;
- if (n == 'k' - 65 && !showkey)
+ if (pm->IsParameterSecret() && !showsecret)
{
- sparam += " <key>";
+ sparam += " <" + pm->name + ">";
}
else
{