Merge branch 'fixbug_cyy' into 'master'

* Fix bug #20156. See merge request easycorp/zentaopms!2570
2022-03-28 03:16:18 +00:00
parent b9e4882cd8 99ad50eb3e
commit c6e89fc7c1
1 changed files with 2 additions and 1 deletions
@@ -1627,7 +1627,8 @@ class bug extends control

            $files = $this->loadModel('file')->saveUpload('bug', $bugID);

-            $actionID = $this->action->create('bug', $bugID, 'Activated', $this->post->comment);
+            $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
+            $actionID   = $this->action->create('bug', $bugID, 'Activated', $fileAction . $this->post->comment);
            $this->action->logHistory($actionID, $changes);

            $this->executeHooks($bugID);