Fix for bug #541: /taxonomy reporting metadata for incorrect user. Can someone please...

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

diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp
index 05fe5ffdc0c1d6d1bbc7683172ff9f6ef07e67d8..f01cb1564c7325a019918e58c5af4747f3934ff3 100644 (file)
--- a/src/modules/m_sapart.cpp
+++ b/src/modules/m_sapart.cpp
@@ -31,14 +31,12 @@ class CommandSapart : public Command
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
                Channel* channel = ServerInstance->FindChan(parameters[1]);
-               std::string reason;
+               std::string reason = "";
 
                if (dest && channel)
                {
-                       if (parameters.size() == 3)
+                       if (parameters.size() > 2)
                                reason = parameters[2];
-                       else
-                               reason = dest->nick;
 
                        if (ServerInstance->ULine(dest->server))
                        {
@@ -52,8 +50,9 @@ class CommandSapart : public Command
                         */
                        if (IS_LOCAL(dest))
                        {
-                               if (!channel->PartUser(dest, reason.c_str()))
+                               if (!channel->PartUser(dest, reason))
                                        delete channel;
+
                                Channel* n = ServerInstance->FindChan(parameters[1]);
                                if (!n)
                                {