Merge branch '15.4'

2021-09-02 19:21:30 +08:00
parent 28be8dbc61 3fb14ef213
commit 4eee4d5523
35 changed files with 228 additions and 146 deletions
@@ -388,6 +388,7 @@ class buildModel extends model
        $oldBuild = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
        $build    = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags)
            ->setDefault('product', $oldBuild->product)
+            ->setDefault('branch', $oldBuild->branch)
            ->cleanInt('product,branch,execution')
            ->remove('allchecker,resolvedBy,files,labels,uid')
            ->get();