From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 11 Oct 2015 14:27:10 +0000 (+0200)
Subject: Revert "Fix sending the wrong numerics on join when a topic is empty."
X-Git-Tag: v2.0.23~42
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=8adc04585d1f4588e61506490c1128026824a738;hp=b2db94675b1881ab40f2e6c625f716f79e1efcc4;p=user%2Fhenk%2Fcode%2Finspircd.git

Revert "Fix sending the wrong numerics on join when a topic is empty."

This reverts commit b0e64b8cea2d721588d92072a8d16fdd99a9c945.

The original behavior isn't RFC incompliant, see #1095.
---

diff --git a/src/channels.cpp b/src/channels.cpp
index 6802e3d7d..9f1eafd0c 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -412,7 +412,7 @@ Channel* Channel::ForceChan(Channel* Ptr, User* user, const std::string &privs,
 
 	if (IS_LOCAL(user))
 	{
-		if (!Ptr->topic.empty())
+		if (Ptr->topicset)
 		{
 			user->WriteNumeric(RPL_TOPIC, "%s %s :%s", user->nick.c_str(), Ptr->name.c_str(), Ptr->topic.c_str());
 			user->WriteNumeric(RPL_TOPICTIME, "%s %s %s %lu", user->nick.c_str(), Ptr->name.c_str(), Ptr->setby.c_str(), (unsigned long)Ptr->topicset);