fix(targetticket,targetchange): file dispatch accross several targets…

… broken without this fix all file uploads were added to all targets, ignoring the absence of tag of the file questions Signed-off-by: Thierry Bugier <[email protected]>
pluginsGLPI · Jul 8, 2021 · 753b423 · 753b423
1 parent 6392cdf
commit 753b423
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -1105,19 +1105,16 @@ public function parseTags(string $content, PluginFormcreatorTargetInterface $tar
          }
 
          $content = str_replace('##question_' . $questionId . '##', Toolbox::addslashes_deep($name), $content);
-         $content = str_replace('##answer_' . $questionId . '##', Toolbox::addslashes_deep($value), $content);
-         if ($target !== null) {
-            foreach ($this->questionFields[$questionId]->getDocumentsForTarget() as $documentId) {
-               $target->addAttachedDocument($documentId);
-            }
-         }
          if ($question->fields['fieldtype'] === 'file') {
             if (strpos($content, '##answer_' . $questionId . '##') !== false) {
-               if (!is_array($value)) {
-                  $value = [$value];
+               if ($target !== null) {
+                  foreach ($this->questionFields[$questionId]->getDocumentsForTarget() as $documentId) {
+                     $target->addAttachedDocument($documentId);
+                  }
                }
             }
          }
+         $content = str_replace('##answer_' . $questionId . '##', Toolbox::addslashes_deep($value), $content);
 
          if ($this->questionFields[$questionId] instanceof DropdownField) {
             $content = $this->questionFields[$questionId]->parseObjectProperties($field->getValueForDesign(), $content);