@@ -163,18 +163,22 @@ protected function evaluateLeaf($setting, $settingSection)
163
163
$ setting ['error ' ] = false ;
164
164
if (!$ skipValidation ) {
165
165
$ validationResult = true ;
166
- if (!isset ($ setting ['value ' ])) {
167
- $ validationResult = $ this ->settingValidator ->testEmptyBecomesDefault (null , $ setting );
168
- } else if (isset ($ setting ['test ' ])) {
169
- $ setting ['value ' ] = $ setting ['value ' ] ?? '' ;
170
- $ validationResult = $ this ->evaluateFunctionForSetting ($ setting ['test ' ], $ setting );
171
- }
172
- if ($ validationResult !== true ) {
173
- $ setting ['severity ' ] = $ setting ['severity ' ] ?? 'warning ' ;
174
- if (!in_array ($ setting ['severity ' ], $ this ->severities )) {
175
- $ setting ['severity ' ] = 'warning ' ;
166
+ if (empty ($ setting ['value ' ]) && !empty ($ setting ['empty ' ])) {
167
+ $ validationResult = true ;
168
+ } else {
169
+ if (!isset ($ setting ['value ' ])) {
170
+ $ validationResult = $ this ->settingValidator ->testEmptyBecomesDefault (null , $ setting );
171
+ } else if (isset ($ setting ['test ' ])) {
172
+ $ setting ['value ' ] = $ setting ['value ' ] ?? '' ;
173
+ $ validationResult = $ this ->evaluateFunctionForSetting ($ setting ['test ' ], $ setting );
174
+ }
175
+ if ($ validationResult !== true ) {
176
+ $ setting ['severity ' ] = $ setting ['severity ' ] ?? 'warning ' ;
177
+ if (!in_array ($ setting ['severity ' ], $ this ->severities )) {
178
+ $ setting ['severity ' ] = 'warning ' ;
179
+ }
180
+ $ setting ['errorMessage ' ] = $ validationResult ;
176
181
}
177
- $ setting ['errorMessage ' ] = $ validationResult ;
178
182
}
179
183
$ setting ['error ' ] = $ validationResult !== true ? true : false ;
180
184
}
0 commit comments