Fix object does not exist error when checking citation file (go-gitea…

…#28314) (go-gitea#28369) Backport go-gitea#28314 by @yp05327 Fix go-gitea#28264 `DataAsync()` will be called twice. Caused by go-gitea#27958. I'm sorry, I didn't completely remove all unnecessary codes. Co-authored-by: yp05327 <[email protected]>
project-mirrors · Dec 6, 2023 · c5c44d0 · c5c44d0
1 parent 8f2805f
commit c5c44d0
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -702,21 +702,14 @@ func checkCitationFile(ctx *context.Context, entry *git.TreeEntry) {
 	}
 	for _, entry := range allEntries {
 		if entry.Name() == "CITATION.cff" || entry.Name() == "CITATION.bib" {
-			ctx.Data["CitiationExist"] = true
 			// Read Citation file contents
-			blob := entry.Blob()
-			dataRc, err := blob.DataAsync()
-			if err != nil {
-				ctx.ServerError("DataAsync", err)
-				return
-			}
-			defer dataRc.Close()
-			ctx.PageData["citationFileContent"], err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize)
-			if err != nil {
-				ctx.ServerError("GetBlobContent", err)
-				return
+			if content, err := entry.Blob().GetBlobContent(setting.UI.MaxDisplayFileSize); err != nil {
+				log.Error("checkCitationFile: GetBlobContent: %v", err)
+			} else {
+				ctx.Data["CitiationExist"] = true
+				ctx.PageData["citationFileContent"] = content
+				break
 			}
-			break
 		}
 	}
 }