@@ -74,7 +74,10 @@ func DefaultEditorsNames() string {
74
74
75
75
func GetDefaultEditors () ([]* Editor , error ) {
76
76
defaultNames , err := system .GetSetting (KeyDevDefaultEditors )
77
- if err != nil && ! system .IsErrSettingIsNotExist (err ) {
77
+ if err != nil {
78
+ if system .IsErrSettingIsNotExist (err ) {
79
+ return nil , nil
80
+ }
78
81
return nil , err
79
82
}
80
83
names := strings .Split (defaultNames , "," )
@@ -95,17 +98,12 @@ func SetDefaultEditors(names []string) error {
95
98
})
96
99
}
97
100
98
- type ErrUnknownEditor struct {
99
- editorName string
100
- }
101
-
102
- func (e ErrUnknownEditor ) Error () string {
103
- return "Unknown editor: " + e .editorName
104
- }
105
-
106
101
func GetUserDefaultEditors (userID int64 ) ([]* Editor , error ) {
107
102
defaultNames , err := user_model .GetSetting (userID , KeyDevDefaultEditors )
108
103
if err != nil {
104
+ if user_model .IsErrUserSettingIsNotExist (err ) {
105
+ return nil , nil
106
+ }
109
107
return nil , err
110
108
}
111
109
names := strings .Split (defaultNames , "," )
@@ -131,10 +129,6 @@ func GetUserDefaultEditorsWithFallback(user *user_model.User) ([]*Editor, error)
131
129
return editor , nil
132
130
}
133
131
134
- if theErr , ok := err .(ErrUnknownEditor ); ok {
135
- log .Error ("Unknown editor for user %d: %s, fallback to system default" , user .ID , theErr .editorName )
136
- return GetDefaultEditors ()
137
- }
138
132
if user_model .IsErrUserSettingIsNotExist (err ) {
139
133
return GetDefaultEditors ()
140
134
}
0 commit comments