repo: fix unable to propose pull request from secondary fork (#4324)

2 files changed, 12 insertions, 10 deletions

diff --git a/models/models.go b/models/models.go
index e946105d..1d0d5740 100644
--- a/models/models.go
+++ b/models/models.go
@@ -194,7 +194,6 @@ func SetEngine() (err error) {
 	// WARNING: for serv command, MUST remove the output to os.stdout,
 	// so use log file to instead print to stdout.
 	sec := setting.Cfg.Section("log.xorm")
-	fmt.Println(sec.Key("ROTATE_DAILY").MustBool(true))
 	logger, err := log.NewFileWriter(path.Join(setting.LogRootPath, "xorm.log"),
 		log.FileRotationConfig{
 			Rotate:  sec.Key("ROTATE").MustBool(true),
diff --git a/models/repo.go b/models/repo.go
index 925a6f90..0eb79577 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -236,6 +236,18 @@ func (repo *Repository) loadAttributes(e Engine) (err error) {
 		}
 	}
 
+	if repo.IsFork && repo.BaseRepo == nil {
+		repo.BaseRepo, err = getRepositoryByID(e, repo.ForkID)
+		if err != nil {
+			if errors.IsRepoNotExist(err) {
+				repo.IsFork = false
+				repo.ForkID = 0
+			} else {
+				return fmt.Errorf("getRepositoryByID [%d]: %v", repo.ForkID, err)
+			}
+		}
+	}
+
 	return nil
 }
 
@@ -418,15 +430,6 @@ func (repo *Repository) GetMirror() (err error) {
 	return err
 }
 
-func (repo *Repository) GetBaseRepo() (err error) {
-	if !repo.IsFork {
-		return nil
-	}
-
-	repo.BaseRepo, err = GetRepositoryByID(repo.ForkID)
-	return err
-}
-
 func (repo *Repository) repoPath(e Engine) string {
 	return RepoPath(repo.mustOwner(e).Name, repo.Name)
 }