diff --git a/models/system/setting.go b/models/system/setting.go index ff8b48e61801b..b2fd4568fc98f 100644 --- a/models/system/setting.go +++ b/models/system/setting.go @@ -89,6 +89,10 @@ func GetSetting(key string) (*Setting, error) { // GetSettings returns specific settings func GetSettings(keys []string) (map[string]*Setting, error) { + if db.DefaultContext == nil { + return map[string]*Setting{}, nil + } + for i := 0; i < len(keys); i++ { keys[i] = strings.ToLower(keys[i]) } diff --git a/routers/install/install.go b/routers/install/install.go index 8a0d34d97631b..a4149959f5e5e 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -385,7 +385,6 @@ func SubmitInstall(ctx *context.Context) { ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form) return } - db.UnsetDefaultEngine() // Save settings. cfg := ini.Empty()