Fix #66

2 files changed, 17 insertions, 11 deletions

diff --git a/models/repo.go b/models/repo.go
index acee6f6af6..bb5c36372e 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -138,11 +138,8 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
 		IsPrivate:   private,
 		IsBare:      repoLang == "" && license == "" && !initReadme,
 	}
-
 	repoPath := RepoPath(user.Name, repoName)
-	if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
-		return nil, err
-	}
+
 	sess := orm.NewSession()
 	defer sess.Close()
 	sess.Begin()
@@ -207,6 +204,10 @@ func CreateRepository(user *User, repoName, desc, repoLang, license string, priv
 		log.Error("repo.CreateRepository(WatchRepo): %v", err)
 	}
 
+	if err = initRepository(repoPath, user, repo, initReadme, repoLang, license); err != nil {
+		return nil, err
+	}
+
 	return repo, nil
 }
 
@@ -332,6 +333,11 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 		return nil
 	}
 
+	// for update use
+	os.Setenv("userName", user.Name)
+	os.Setenv("userId", base.ToStr(user.Id))
+	os.Setenv("repoName", repo.Name)
+
 	// Apply changes and commit.
 	return initRepoCommit(tmpDir, user.NewGitSig())
 }
diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index ce1e2f5bec..1893ccee6e 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -133,8 +133,8 @@ func RenderSpecialLink(rawBytes []byte, urlPrefix string) []byte {
 }
 
 func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
-	body := RenderSpecialLink(rawBytes, urlPrefix)
-	fmt.Println(string(body))
+	// body := RenderSpecialLink(rawBytes, urlPrefix)
+	// fmt.Println(string(body))
 	htmlFlags := 0
 	// htmlFlags |= gfm.HTML_USE_XHTML
 	// htmlFlags |= gfm.HTML_USE_SMARTYPANTS
@@ -146,10 +146,10 @@ func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
 	htmlFlags |= gfm.HTML_GITHUB_BLOCKCODE
 	htmlFlags |= gfm.HTML_OMIT_CONTENTS
 	// htmlFlags |= gfm.HTML_COMPLETE_PAGE
-	// renderer := &CustomRender{
-	// 	Renderer:  gfm.HtmlRenderer(htmlFlags, "", ""),
-	// 	urlPrefix: urlPrefix,
-	// }
+	renderer := &CustomRender{
+		Renderer:  gfm.HtmlRenderer(htmlFlags, "", ""),
+		urlPrefix: urlPrefix,
+	}
 
 	// set up the parser
 	extensions := 0
@@ -162,7 +162,7 @@ func RenderMarkdown(rawBytes []byte, urlPrefix string) []byte {
 	extensions |= gfm.EXTENSION_SPACE_HEADERS
 	extensions |= gfm.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
 
-	// body = gfm.Markdown(body, renderer, extensions)
+	body := gfm.Markdown(rawBytes, renderer, extensions)
 	// fmt.Println(string(body))
 	return body
 }