summaryrefslogtreecommitdiffstats
path: root/modules/setting/setting.go
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-06 21:16:23 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-06 21:16:23 -0500
commit216683004e8bf3e7523236416be21b2123d32e8e (patch)
tree4f4f4d1daac9177c926250f2634dd4d97b2f0a37 /modules/setting/setting.go
parent87b90372a7a30fb9431e03d84d766c92447ff297 (diff)
downloadgitea-216683004e8bf3e7523236416be21b2123d32e8e.tar.gz
gitea-216683004e8bf3e7523236416be21b2123d32e8e.zip
code fix for #908, and work for #884
Diffstat (limited to 'modules/setting/setting.go')
-rw-r--r--modules/setting/setting.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 4d407362c5..e79e6d6b96 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -325,7 +325,7 @@ func newService() {
Service.ActiveCodeLives = Cfg.Section("service").Key("ACTIVE_CODE_LIVE_MINUTES").MustInt(180)
Service.ResetPwdCodeLives = Cfg.Section("service").Key("RESET_PASSWD_CODE_LIVE_MINUTES").MustInt(180)
Service.DisableRegistration = Cfg.Section("service").Key("DISABLE_REGISTRATION").MustBool()
- Service.ShowRegistrationButton = Cfg.Section("service").Key("SHOW_REGISTRATION_BUTTON").MustBool()
+ Service.ShowRegistrationButton = Cfg.Section("service").Key("SHOW_REGISTRATION_BUTTON").MustBool(!Service.DisableRegistration)
Service.RequireSignInView = Cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").MustBool()
Service.EnableCacheAvatar = Cfg.Section("service").Key("ENABLE_CACHE_AVATAR").MustBool()
Service.EnableReverseProxyAuth = Cfg.Section("service").Key("ENABLE_REVERSE_PROXY_AUTHENTICATION").MustBool()