Merge: - clients: settings safebrowsing_enabled and safesearch_enabled were incorrect (reversed)

Close #1339

* commit '4386e8ddde296f270fada3deba43a48b53b5da4c':
  - settings safebrowsing_enabled and safesearch_enabled were incorrect (reversed)
This commit is contained in:
Simon Zolin 2020-01-10 12:22:00 +03:00
commit d309a7e33c
2 changed files with 4 additions and 4 deletions

View File

@ -102,8 +102,8 @@ type clientObject struct {
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safebrowsing_enabled"`
SafeBrowsingEnabled bool `yaml:"safesearch_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
UseGlobalBlockedServices bool `yaml:"use_global_blocked_services"`
BlockedServices []string `yaml:"blocked_services"`

View File

@ -13,8 +13,8 @@ type clientJSON struct {
UseGlobalSettings bool `json:"use_global_settings"`
FilteringEnabled bool `json:"filtering_enabled"`
ParentalEnabled bool `json:"parental_enabled"`
SafeSearchEnabled bool `json:"safebrowsing_enabled"`
SafeBrowsingEnabled bool `json:"safesearch_enabled"`
SafeSearchEnabled bool `json:"safesearch_enabled"`
SafeBrowsingEnabled bool `json:"safebrowsing_enabled"`
WhoisInfo map[string]interface{} `json:"whois_info"`