X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_spanningtree%2Fftopic.cpp;h=99816e64acaf2f17fa265ebc3a26b8e4c997338d;hb=46ecb9252891c472c1f34fb6a2b5fb7ffeef3793;hp=2ed813b0f8cdb7f4f4e630cad987400181adeaee;hpb=b683e9dccb18cd5dc22455d31cf99369049b0599;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 2ed813b0f..99816e64a 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -27,19 +27,20 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 	if (params.size() != 4)
 		return true;
 	time_t ts = atoi(params[1].c_str());
-	Channel* c = this->Instance->FindChan(params[0]);
+	Channel* c = this->ServerInstance->FindChan(params[0]);
 	if (c)
 	{
 		if ((ts >= c->topicset) || (c->topic.empty()))
 		{
 			if (c->topic != params[3])
 			{
-				User* user = this->Instance->FindNick(source);
+				User* user = this->ServerInstance->FindNick(source);
 				// Update topic only when it differs from current topic
-				c->topic.assign(params[3], 0, Instance->Config->Limits.MaxTopic);
+				c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
 				if (!user)
 				{
-					c->WriteChannelWithServ(Instance->Config->ServerName, "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
+					std::string sourceserv = Utils->FindServer(source)->GetName();
+					c->WriteChannelWithServ(sourceserv.c_str(), "TOPIC %s :%s", c->name.c_str(), c->topic.c_str());
 				}
 				else
 				{