Merge tag 'v2.0.25' into master.

[user/henk/code/inspircd.git] / src / modules / m_uninvite.cpp

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index d3045eadca806bbe4ef6fb396606382423d717df..d3a424dff003629c12e2e26a0bf47423b9d56fcc 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -96,7 +96,7 @@ class CommandUninvite : public Command
                        lu->WriteNumeric(493, InspIRCd::Format("You were uninvited from %s by %s", c->name.c_str(), user->nick.c_str()));
 
                        std::string msg = "*** " + user->nick + " uninvited " + u->nick + ".";
-                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE " + c->name + " :" + msg);
+                       c->WriteNotice(msg);
                        ServerInstance->PI->SendChannelNotice(c, 0, msg);
                }
 
@@ -105,8 +105,7 @@ class CommandUninvite : public Command
 
        RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
        {
-               User* u = ServerInstance->FindNick(parameters[0]);
-               return u ? ROUTE_OPT_UCAST(u->server) : ROUTE_LOCALONLY;
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
 };