Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modules/m_spanningtree/encap.cpp b/src/modules/m_spanningtree/encap.cpp
index 51194e6d7e902b9af416d2eb5cb172f3bb70efcc..dabfc086bce5542b138d4638b074b8edbfd0acfe 100644 (file)
--- a/src/modules/m_spanningtree/encap.cpp
+++ b/src/modules/m_spanningtree/encap.cpp
@@ -32,13 +32,13 @@ void TreeSocket::Encap(User* who, parameterlist &params)
                if (ServerInstance->Config->GetSID() == params[0] || InspIRCd::Match(ServerInstance->Config->ServerName, params[0]))
                {
                        parameterlist plist(params.begin() + 2, params.end());
-                       ServerInstance->CallCommandHandler(params[1].c_str(), plist, who);
+                       ServerInstance->Parser->CallHandler(params[1], plist, who);
                        // discard return value, ENCAP shall succeed even if the command does not exist
                }
                
                params[params.size() - 1] = ":" + params[params.size() - 1];
 
-               if (params[0].find('*') != std::string::npos)
+               if (params[0].find_first_of("*?") != std::string::npos)
                {
                        Utils->DoOneToAllButSender(who->uuid, "ENCAP", params, who->server);
                }