From 3c0705ecf3167c1d782a5f3ed26ff0041bc4879d Mon Sep 17 00:00:00 2001
From: Ethan Koenig <etk39@cornell.edu>
Date: Fri, 30 Jun 2017 23:10:04 -0400
Subject: [PATCH] Absolute path for setting.CustomConf (#2085)

---
 modules/setting/setting.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index d07dce39a0..f24a87653b 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -595,6 +595,8 @@ func NewContext() {
 
 	if len(CustomConf) == 0 {
 		CustomConf = CustomPath + "/conf/app.ini"
+	} else if !filepath.IsAbs(CustomConf) {
+		CustomConf = filepath.Join(workDir, CustomConf)
 	}
 
 	if com.IsFile(CustomConf) {