mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 07:21:36 +01:00 
			
		
		
		
	Fix object does not exist error when checking citation file (#28314)
Fix #28264 `DataAsync()` will be called twice. Caused by https://github.com/go-gitea/gitea/pull/27958. I'm sorry, I didn't completely remove all unnecessary codes.
This commit is contained in:
		
							parent
							
								
									09d5028442
								
							
						
					
					
						commit
						ec90ee61ef
					
				| @ -711,21 +711,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 | ||||
| 			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 | ||||
| 			} | ||||
| 			defer dataRc.Close() | ||||
| 			ctx.PageData["citationFileContent"], err = blob.GetBlobContent(setting.UI.MaxDisplayFileSize) | ||||
| 			if err != nil { | ||||
| 				ctx.ServerError("GetBlobContent", err) | ||||
| 				return | ||||
| 			} | ||||
| 			break | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user