Fix bugs

Author: lunny

modules/templates/base.go

@@ -11,6 +11,7 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
+
 	"github.com/unknwon/com"
 )
 

modules/templates/static.go

@@ -49,8 +49,7 @@ func (templates templateFileSystem) Get(name string) (io.Reader, error) {
 }
 
 func GetAsset(name string) ([]byte, error) {
-	customDir := filepath.Join(setting.CustomPath, "templates")
-	bs, err := ioutil.ReadFile(filepath.Join(customDir, name))
+	bs, err := ioutil.ReadFile(filepath.Join(setting.CustomPath, name))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	} else if err == nil {

routers/routes/recovery.go

@@ -30,14 +30,15 @@ func (d *dataStore) GetData() map[string]interface{} {
 // Although similar to macaron.Recovery() the main difference is that this error will be created
 // with the gitea 500 page.
 func Recovery() func(next http.Handler) http.Handler {
+	var isDevelopment = setting.RunMode != "prod"
 	return func(next http.Handler) http.Handler {
 		rnd := render.New(render.Options{
 			Extensions:    []string{".tmpl"},
 			Directory:     "templates",
 			Funcs:         templates.NewFuncMap(),
 			Asset:         templates.GetAsset,
 			AssetNames:    templates.GetAssetNames,
-			IsDevelopment: setting.RunMode != "prod",
+			IsDevelopment: isDevelopment,
 		})
 
 		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
@@ -50,7 +51,11 @@ func Recovery() func(next http.Handler) http.Handler {
 					if err := recover(); err != nil {
 						combinedErr := fmt.Sprintf("PANIC: %v\n%s", err, string(log.Stack(2)))
 						log.Error(combinedErr)
-						http.Error(w, http.StatusText(500), 500)
+						if isDevelopment {
+							http.Error(w, combinedErr, 500)
+						} else {
+							http.Error(w, http.StatusText(500), 500)
+						}
 					}
 				}()