From e4af89f4d7da40b675f727317246a60d57be2349 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Wed, 13 Jan 2016 17:11:16 -0600 Subject: [PATCH] Revert "LIST: since we now have channel::strip_topic_colors, don't unconditionally strip colors here anymore" This reverts commit b28b21f6d502ea154a005fd380ba2f812609f4da. --- modules/m_list.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/m_list.c b/modules/m_list.c index fbecd520..81ac0e99 100644 --- a/modules/m_list.c +++ b/modules/m_list.c @@ -281,10 +281,17 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible) { + char topic[TOPICLEN + 1]; + + if (chptr->topic != NULL) + rb_strlcpy(topic, chptr->topic, sizeof topic); + else + topic[0] = '\0'; + strip_colour(topic); sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, visible ? "" : "!", chptr->chname, rb_dlink_list_length(&chptr->members), - chptr->topic != NULL ? chptr->topic : ""); + topic); } /*