Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* resolve conflict task #78665

Browse Source
This commit is contained in:
liuhong
2022-12-09 07:21:08 +00:00
parent dd13c3d947
commit 94b3f9bfd5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
module/build/control.php
View File

@@ -647,11 +647,10 @@ class build extends control
$branches = array('' => $branchAll) + array(BRANCH_MAIN => $this->lang->branch->main);
if($build->branch)
{
if(strpos($build->branch, ',') !== false) $buildBranch = explode(',', $build->branch);
foreach($buildBranch as $buildKey)
foreach(explode(',', $build->branch) as $branchID)
{
if($buildKey == '0') continue;
$branches += array($buildKey => $branchPairs[$buildKey]);
if($branchID == '0') continue;
$branches += array($branchID => $branchPairs[$branchID]);
}
}