Show correct server source to users on FTOPIC and FMODE

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11380 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
danieldg 2009-05-13 17:04:25 +00:00
parent 97c0e6b4c4
commit 46ecb92528
2 changed files with 3 additions and 2 deletions

View File

@ -766,7 +766,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user,
if (!output_sequence.empty())
{
LastParseParams.push_front(output_sequence);
if (servermode)
if (!user)
{
if (type == MODETYPE_CHANNEL)
{

View File

@ -39,7 +39,8 @@ bool TreeSocket::ForceTopic(const std::string &source, std::deque<std::string> &
c->topic.assign(params[3], 0, ServerInstance->Config->Limits.MaxTopic);
if (!user)
{
c->WriteChannelWithServ(ServerInstance->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
{