Merge branch 'main' into lunny/issue_dev

This commit is contained in:
Lunny Xiao
2024-09-29 20:00:45 -07:00
180 changed files with 3211 additions and 867 deletions
+1 -1
View File
@@ -83,7 +83,7 @@ func UnwrapLDAPSourceCfg(x *xorm.Engine) error {
if err != nil {
return fmt.Errorf("failed to unmarshal %s: %w", source.Cfg, err)
}
if wrapped.Source != nil && len(wrapped.Source) > 0 {
if len(wrapped.Source) > 0 {
bs, err := json.Marshal(wrapped.Source)
if err != nil {
return err