Fix IsValidUsername check when PagesParentDir isn't current dir

Previously, this check would only work if there was a pages/ dir in the
current working directory. Now it respects the pages_parent_dir
configuration setting.
This commit is contained in:
Matt Baer 2019-03-06 10:44:32 -05:00
parent 372b4e5dcd
commit 3d30a09695

View file

@ -112,8 +112,7 @@ func IsValidUsername(cfg *config.Config, username string) bool {
// Username is invalid if page with the same name exists. So traverse // Username is invalid if page with the same name exists. So traverse
// available pages, adding them to reservedUsernames map that'll be checked // available pages, adding them to reservedUsernames map that'll be checked
// later. // later.
// TODO: use pagesDir const filepath.Walk(filepath.Join(cfg.Server.PagesParentDir, "pages"), func(path string, i os.FileInfo, err error) error {
filepath.Walk("pages/", func(path string, i os.FileInfo, err error) error {
reservedUsernames[i.Name()] = true reservedUsernames[i.Name()] = true
return nil return nil
}) })