Merge branch 'insp20' into master.

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

diff --git a/src/modules/m_spanningtree/override_map.cpp b/src/modules/m_spanningtree/override_map.cpp
index a22fa48acb9f7e621e005b21b8862180e59779d0..693b07bade23e478818fd7f71c2b03beb57f993e 100644 (file)
--- a/src/modules/m_spanningtree/override_map.cpp
+++ b/src/modules/m_spanningtree/override_map.cpp
@@ -76,7 +76,13 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
        std::string buffer = current->GetName();
        if (user->IsOper())
        {
-               buffer += " (" + current->GetID() + ")";
+               buffer += " (" + current->GetID();
+
+               const std::string& cur_vers = current->GetRawVersion();
+               if (!cur_vers.empty())
+                       buffer += " " + cur_vers;
+
+               buffer += ")";
        }
 
        // Pad with spaces until its at max len, max_len must always be >= my names length
@@ -162,7 +168,7 @@ static std::vector<std::string> GetMap(User* user, TreeServer* current, unsigned
        return map;
 }
 
-CmdResult CommandMap::Handle(const std::vector<std::string>& parameters, User* user)
+CmdResult CommandMap::Handle(User* user, const Params& parameters)
 {
        if (parameters.size() > 0)
        {
@@ -209,7 +215,7 @@ CmdResult CommandMap::Handle(const std::vector<std::string>& parameters, User* u
        return CMD_SUCCESS;
 }
 
-RouteDescriptor CommandMap::GetRouting(User* user, const std::vector<std::string>& parameters)
+RouteDescriptor CommandMap::GetRouting(User* user, const Params& parameters)
 {
        if (!parameters.empty())
                return ROUTE_UNICAST(parameters[0]);