Merge tag 'v2.0.25' into master.

[user/henk/code/inspircd.git] / src / modmanager_static.cpp

diff --git a/src/modmanager_static.cpp b/src/modmanager_static.cpp
index 5c04a76800f6e211afbfea316c0ca4ea11cd45f4..4de111b63ae44e303b906f069915e609a52f5d52 100644 (file)
--- a/src/modmanager_static.cpp
+++ b/src/modmanager_static.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#define MODNAME "cmd_all"
+#define MODNAME "core_all"
 
 #include "inspircd.h"
 #include "exitcodes.h"
@@ -72,7 +72,7 @@ class AllModule : public Module
                stdalgo::delete_all(cmds);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("All commands", VF_VENDOR|VF_CORE);
        }
@@ -136,7 +136,7 @@ void ModuleManager::LoadCoreModules(std::map<std::string, ServiceList>& servicem
        for (modmap::const_iterator i = modlist->begin(); i != modlist->end(); ++i)
        {
                const std::string modname = i->first;
-               if (modname[0] == 'c')
+               if (InspIRCd::Match(modname, "core_*.so", ascii_case_insensitive_map))
                {
                        this->NewServices = &servicemap[modname];
                        Load(modname, true);