From e6eddbb0753b57bda72b8831bb8fe4edeaaccca7 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 21 Dec 2022 17:31:08 +0800 Subject: [PATCH] * fix bug #30242. --- module/bug/model.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index ffacd7ed8a..1dfe43ca60 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -3222,16 +3222,16 @@ class bugModel extends model if(empty($resolvedBuild) or $resolvedBuild == 'trunk') return true; if(is_array($bugs)) $bugs = join(',', $bugs); - $buildBugs = $this->dao->select('bugs')->from(TABLE_BUILD)->where('id')->eq($resolvedBuild)->fetch('bugs'); - $buildBugs .= ',' . $bugs; - $buildBugs = explode(',', trim($buildBugs, ',')); - $buildBugs = array_unique($buildBugs); + $build = $this->dao->select('id,product,bugs')->from(TABLE_BUILD)->where('id')->eq($resolvedBuild)->fetch(); + $buildBugs = $build->bugs . ',' . $bugs; + $buildBugs = explode(',', trim($buildBugs, ',')); + $buildBugs = array_unique($buildBugs); $this->dao->update(TABLE_BUILD)->set('bugs')->eq(join(',', $buildBugs))->where('id')->eq($resolvedBuild)->exec(); - $release = $this->dao->select('id,bugs')->from(TABLE_RELEASE)->where('build')->eq($resolvedBuild)->andWhere('deleted')->eq('0')->fetch(); + $release = $this->dao->select('id,bugs')->from(TABLE_RELEASE)->where('product')->eq($build->product)->andWhere("(FIND_IN_SET('$resolvedBuild', build) or shadow = $resolvedBuild)")->andWhere('deleted')->eq('0')->fetch(); if($release) { - $releaseBugs = $release->bugs .',' . $bugs; + $releaseBugs = $release->bugs . ',' . $bugs; $releaseBugs = explode(',', trim($releaseBugs, ',')); $releaseBugs = array_unique($releaseBugs); $this->dao->update(TABLE_RELEASE)->set('bugs')->eq(join(',', $releaseBugs))->where('id')->eq($release->id)->exec();