From 910eb61cd48d9db0469b9c15413bb2c8afc6bf0b Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 31 May 2021 16:03:52 +0800 Subject: [PATCH 1/2] * Fix bug#12748. --- module/bug/model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/bug/model.php b/module/bug/model.php index 415e908413..7c80bc96e8 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -634,7 +634,11 @@ class bugModel extends model if(!dao::isError()) { /* Link bug to build and release. */ - if($bug->resolution == 'fixed' and !empty($bug->resolvedBuild))$this->linkBugToBuild($bugID, $bug->resolvedBuild); + if($bug->resolution == 'fixed' and !empty($bug->resolvedBuild) and $oldBug->resolvedBuild != $bug->resolvedBuild) + { + if(!empty($oldBug->resolvedBuild)) $this->loadModel('build')->unlinkBug((int)$oldBug->resolvedBuild, (int)$bugID); + $this->linkBugToBuild($bugID, $bug->resolvedBuild); + } if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID); $this->file->updateObjectID($this->post->uid, $bugID, 'bug'); From 7e8f5657ba9b784b292705efed2467b2bd0f2a86 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 31 May 2021 16:21:24 +0800 Subject: [PATCH 2/2] * Fix bug#38647. --- module/project/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/project/model.php b/module/project/model.php index 9fac539104..78dd92a0a3 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -168,6 +168,7 @@ class projectModel extends model if(!$project) return false; if($project->end == '0000-00-00') $project->end = ''; + $project = $this->loadModel('file')->replaceImgURL($project, 'desc'); return $project; }