Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

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');

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;
     }