From 5db71c6590dad005b036f201a1a1f2f564c0cb69 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 31 Mar 2022 18:21:38 +0200 Subject: [PATCH 1/2] no global var --- routers/install/install.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/install/install.go b/routers/install/install.go index 164ce6840565f..e70d0c9e14de1 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -42,8 +42,8 @@ const ( tplPostInstall base.TplName = "post-install" ) -var supportedDbTypeNames []map[string]string // use a slice to keep order func getDbTypeNames() []map[string]string { + var supportedDbTypeNames []map[string]string // use a slice to keep order if supportedDbTypeNames == nil { for _, t := range setting.SupportedDatabaseTypes { supportedDbTypeNames = append(supportedDbTypeNames, map[string]string{"type": t, "name": setting.DatabaseTypeNames[t]}) From fb6f4cb6168bb3f452b523a808d018cf099ea3aa Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 31 Mar 2022 19:14:14 +0200 Subject: [PATCH 2/2] rm nil check --- routers/install/install.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routers/install/install.go b/routers/install/install.go index e70d0c9e14de1..441481c1654da 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -44,10 +44,8 @@ const ( func getDbTypeNames() []map[string]string { var supportedDbTypeNames []map[string]string // use a slice to keep order - if supportedDbTypeNames == nil { - for _, t := range setting.SupportedDatabaseTypes { - supportedDbTypeNames = append(supportedDbTypeNames, map[string]string{"type": t, "name": setting.DatabaseTypeNames[t]}) - } + for _, t := range setting.SupportedDatabaseTypes { + supportedDbTypeNames = append(supportedDbTypeNames, map[string]string{"type": t, "name": setting.DatabaseTypeNames[t]}) } return supportedDbTypeNames }