diff options
| author | skyblue <ssx205@gmail.com> | 2014-04-12 23:19:22 +0800 |
|---|---|---|
| committer | skyblue <ssx205@gmail.com> | 2014-04-12 23:19:22 +0800 |
| commit | f92851e347c6db6468555373bd43c7b507c5fce9 (patch) | |
| tree | 1eaa45ea5e973edd4f6b39fd92c0a0b4f36b98d5 /modules | |
| parent | 2ce0c3befef3becd48660e600ef70e8affd5bc7c (diff) | |
| parent | 802a110e4255d0860c3942feffd23b2376c75eb7 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/base/conf.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index 871595e4..d1564aa1 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -302,9 +302,9 @@ func NewConfigContext() { InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false) RunUser = Cfg.MustValue("", "RUN_USER") - curUser := os.Getenv("USERNAME") + curUser := os.Getenv("USER") if len(curUser) == 0 { - curUser = os.Getenv("USER") + curUser = os.Getenv("USERNAME") } // Does not check run user when the install lock is off. if InstallLock && RunUser != curUser { |