2 files changed, 11 insertions, 22 deletions

diff --git a/src/modules/m_spanningtree/ftopic.cpp b/src/modules/m_spanningtree/ftopic.cpp
index 663baa089..2ed813b0f 100644
--- a/src/modules/m_spanningtree/ftopic.cpp
+++ b/src/modules/m_spanningtree/ftopic.cpp
@@ -27,16 +27,14 @@ 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());
-	std::string nsource = source;
 	Channel* c = this->Instance->FindChan(params[0]);
 	if (c)
 	{
 		if ((ts >= c->topicset) || (c->topic.empty()))
 		{
-			User* user = this->Instance->FindNick(source);
-
 			if (c->topic != params[3])
 			{
+				User* user = this->Instance->FindNick(source);
 				// Update topic only when it differs from current topic
 				c->topic.assign(params[3], 0, Instance->Config->Limits.MaxTopic);
 				if (!user)
@@ -53,27 +51,9 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
 			c->setby.assign(params[2], 0, 127);
 			c->topicset = ts;
 
-			/*
-			 * Take careful note of what happens here;
-			 * Above, we display the topic change to the server IF the topic incoming is different to the topic already set.
-			 * HERE, we find the server the user that sent this topic is on, so we *do not* send topics back to the link they just
-			 * came from. This *cannot* be easily merged with the above check!
-			 *
-			 * Thanks to Anope and Namegduf for finally helping me isolate this
-			 *			-- w00t (5th/aug/2008)
-			 */
-			if (user)
-			{
-				nsource = user->server;
-			}
-
 			/* all done, send it on its way */
 			params[3] = ":" + params[3];
-			User* u = Instance->FindNick(nsource);
-			if (u)
-				Utils->DoOneToAllButSender(u->uuid,"FTOPIC",params,u->server);
-			else
-				Utils->DoOneToAllButSender(source,"FTOPIC",params,nsource);
+			Utils->DoOneToAllButSender(source,"FTOPIC",params,source);
 		}
 
 	}
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index fd3a1545f..b458988c4 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -68,6 +68,15 @@ TreeServer* SpanningTreeUtilities::BestRouteTo(const std::string &ServerName)
 	}
 	else
 	{
+		// Cheat a bit. This allows for (better) working versions of routing commands with nick based prefixes, without hassle
+		User *u = ServerInstance->FindNick(ServerName);
+		if (u)
+		{
+			Found = FindServer(u->server);
+			if (Found)
+				return Found;
+		}
+
 		return NULL;
 	}
 }