commit a072180c9262f8a1c6bba6b8f0613bccc2863f48
from: Alexander Barton <alex@barton.de>
date: Tue Sep 11 18:29:14 2012 UTC

Merge pull request #2 from briancollins/master

Fix IRC_Send_NAMES not sending correct prefix for certain clients.

commit - 0fd9a8505a2dc325d0a17c7ebbed4b08a76576bf
commit + a072180c9262f8a1c6bba6b8f0613bccc2863f48
blob - 6eb8d9421922e8606e0e5cbd83729f1c90c7d4b5
blob + fc04773ae14ef307d1ac5adb0b53f2a18a64dd03
--- src/ngircd/irc-info.c
+++ src/ngircd/irc-info.c
@@ -1595,10 +1595,10 @@ IRC_Send_NAMES(CLIENT * Client, CHANNEL * Chan)
 		if (is_member || is_visible) {
 			if (str[strlen(str) - 1] != ':')
 				strlcat(str, " ", sizeof(str));
-			if (Client_Cap(cl) & CLIENT_CAP_MULTI_PREFIX) {
-				if (strchr(Channel_UserModes(Chan, cl), 'o') &&
-				    strchr(Channel_UserModes(Chan, cl), 'v'))
-					strlcat(str, "@+", sizeof(str));
+			if (Client_Cap(Client) & CLIENT_CAP_MULTI_PREFIX && 
+					strchr(Channel_UserModes(Chan, cl), 'o') &&
+					strchr(Channel_UserModes(Chan, cl), 'v')) {
+				strlcat(str, "@+", sizeof(str));
 			} else {
 				if (strchr(Channel_UserModes(Chan, cl), 'o'))
 					strlcat(str, "@", sizeof(str));