From 0dc5fbdb3378fc92025af65ea8faede1ace87ee2 Mon Sep 17 00:00:00 2001 From: liuhong Date: Thu, 15 Dec 2022 02:17:42 +0000 Subject: [PATCH] * Fix bug #30845. --- module/build/control.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/module/build/control.php b/module/build/control.php index 7b9a754ab7..8dc4494c0e 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -876,9 +876,10 @@ class build extends control } else { - $branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution); - $branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]); - $branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main); + $buildBranch = array(); + $branchList = $this->loadModel('branch')->getPairs($build->product, '', $build->execution); + $branchAll = sprintf($this->lang->build->branchAll, $this->lang->product->branchName[$product->type]); + $branches = array('' => $branchAll, BRANCH_MAIN => $this->lang->branch->main); if(strpos($build->branch, ',') !== false) $buildBranch = explode(',', $build->branch); foreach($buildBranch as $buildKey) $branches += array($buildKey => zget($branchList, $buildKey));