Merge branch 'master+dns'

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 4dc5ff468f721da7d5b0408f95368c369bc96b0f..c701f16bf1b20cf450e9c75583fa2d9e70ae3575 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -59,16 +59,12 @@ class ModuleNamesX : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
+       ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
-               if (!cap.ext.get(issuer))
-                       return;
-
-               /* Some module hid this from being displayed, dont bother */
-               if (nick.empty())
-                       return;
+               if (cap.ext.get(issuer))
+                       prefixes = memb->GetAllPrefixChars();
 
-               prefixes = memb->GetAllPrefixChars();
+               return MOD_RES_PASSTHRU;
        }
 
        void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
@@ -98,11 +94,6 @@ class ModuleNamesX : public Module
                line.erase(pos, 1);
                line.insert(pos, prefixes);
        }
-
-       void OnEvent(Event& ev) CXX11_OVERRIDE
-       {
-               cap.HandleEvent(ev);
-       }
 };
 
 MODULE_INIT(ModuleNamesX)