Merge branch '2.2' into develop

2018-06-20 14:43:03 +03:00
parent 68e514f08b 14e03613a0
commit 396f5d96c2
8 changed files with 78 additions and 6 deletions
--- a/server/core/config.cc
+++ b/server/core/config.cc
@ -755,7 +755,7 @@ int config_cb(const char* fpath, const struct stat *sb, int typeflag, struct FTW
        const char* filename = fpath + ftwbuf->base;
        const char* dot = strrchr(filename, '.');

-        if (dot) // that must have a suffix,
+        if (dot && *filename != '.') // that have a suffix and are not hidden,
        {
            const char* suffix = dot + 1;