commit - 21767c968d5799ce153f860db6c119eb4b7f9518
commit + 6fc53558ed2117e5dd4e6bd1e9fb595bba67aa79
blob - a9317873a92192454883ff23006a6e0fb01097c6
blob + 61d5e8f66a7cdb83a4fdbe0adf98e6c2420f5f18
--- doc/Modes.txt
+++ doc/Modes.txt
@@ -2,7 +2,7 @@
                      ngIRCd - Next Generation IRC Server
                            http://ngircd.barton.de/
 
-               (c)2001-2014 Alexander Barton and Contributors.
+               (c)2001-2015 Alexander Barton and Contributors.
                ngIRCd is free software and published under the
                    terms of the GNU General Public License.
 
@@ -28,6 +28,7 @@ channels he is using at the moment.
   C	19	Only users that share a channel are allowed to send messages.
   F	22	Relaxed flood protection (only settable by IRC Operators).
   i	0.0.1	User is "invisible".
+  I 23	No channels are shown on WHOIS (IRC Operators can always see those).
   o	0.0.1	User is IRC operator.
   q	20	User is protected, can not be kicked from a channel.
   r	0.0.1	User is restricted.
blob - e261b7f68874940e80f8f8676269299d704134e1
blob + 7bb453df67cc853addca41e34861201cba2b7982
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -327,12 +327,12 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
 
 			/* Secret channel? */
 			if (Channel_HasMode(chan, 's')
-				&& !Channel_IsMemberOf(chan, Client))
+			    && !Channel_IsMemberOf(chan, Client))
 				continue;
 
 			/* Local channel and request is not from a user? */
 			if (Client_Type(Client) == CLIENT_SERVER
-				&& Channel_IsLocal(chan))
+			    && Channel_IsLocal(chan))
 				continue;
 
 			/* Concatenate channel names */
@@ -340,7 +340,6 @@ IRC_WHOIS_SendReply(CLIENT *Client, CLIENT *from, CLIE
 				strlcat(str, " ", sizeof(str));
 
 			who_flags_qualifier(Client, Channel_UserModes(chan, c),
-						str, sizeof(str));
 			strlcat(str, Channel_Name(chan), sizeof(str));
 
 			if (strlen(str) > (COMMAND_LEN - CHANNEL_NAME_LEN - 4)) {