capab: m_kicknorejoin: Don't advertise upper bound to 2.0 servers

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

diff --git a/src/modules/m_spanningtree/fmode.cpp b/src/modules/m_spanningtree/fmode.cpp
index 56757a8b73f989757350a8f0e2d8758b8df2264e..52e512d9275563258f3eead62994195b98ba90bb 100644 (file)
--- a/src/modules/m_spanningtree/fmode.cpp
+++ b/src/modules/m_spanningtree/fmode.cpp
@@ -41,16 +41,15 @@ CmdResult CommandFMode::Handle(User* who, std::vector<std::string>& params)
 
        /* TS is equal or less: Merge the mode changes into ours and pass on.
         */
-       std::vector<std::string> modelist;
-       modelist.reserve(params.size()-1);
-       /* Insert everything into modelist except the TS (params[1]) */
-       modelist.push_back(params[0]);
-       modelist.insert(modelist.end(), params.begin()+2, params.end());
+
+       // Turn modes into a Modes::ChangeList; may have more elements than max modes
+       Modes::ChangeList changelist;
+       ServerInstance->Modes.ModeParamsToChangeList(who, MODETYPE_CHANNEL, params, changelist, 2);
 
        ModeParser::ModeProcessFlag flags = ModeParser::MODE_LOCALONLY;
        if ((TS == ourTS) && IS_SERVER(who))
                flags |= ModeParser::MODE_MERGE;
 
-       ServerInstance->Modes->Process(modelist, who, flags);
+       ServerInstance->Modes->Process(who, chan, NULL, changelist, flags);
        return CMD_SUCCESS;
 }