Merge pull request #1337 from SaberUK/master+merge

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 048e04a5a332ae7fbd8159b9017b3810e274acd2..e97e1b02f82c60a2d8de790e8097051ae210256d 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -168,20 +168,20 @@ class ModuleServicesAccount : public Module, public Whois::EventListener
 
                if (account)
                {
-                       whois.SendLine(330, "%s :is logged in as", account->c_str());
+                       whois.SendLine(330, *account, "is logged in as");
                }
 
                if (whois.GetTarget()->IsModeSet(m5))
                {
                        /* user is registered */
-                       whois.SendLine(307, ":is a registered nick");
+                       whois.SendLine(307, "is a registered nick");
                }
        }
 
        void OnUserPostNick(User* user, const std::string &oldnick) CXX11_OVERRIDE
        {
                /* On nickchange, if they have +r, remove it */
-               if (user->IsModeSet(m5) && assign(user->nick) != oldnick)
+               if ((user->IsModeSet(m5)) && (ServerInstance->FindNickOnly(oldnick) != user))
                        m5.RemoveMode(user);
        }