Merge pull request #569 from ShutterQuick/inspircd+asrootfix

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 91d417b10c09555bd656fea3fcc7a390a94b6c4d..533e70eacfd9d5c96cab5b75664cc7072f98b38c 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -169,7 +169,7 @@ public:
        {
                allow_empty_last_param = false;
                syntax = "{[+|-]<nicks>}|*}";
-               TRANSLATE2(TR_CUSTOM, TR_END);
+               TRANSLATE1(TR_CUSTOM);
        }
 
        void EncodeParameter(std::string& parameter, int index)
@@ -387,7 +387,7 @@ public:
 
        ModResult PreText(User* user, User* dest, std::string& text)
        {
-               if (!dest->IsModeSet('g') || (user == dest))
+               if (!dest->IsModeSet(myumode) || (user == dest))
                        return MOD_RES_PASSTHRU;
 
                if (operoverride && user->IsOper())