Merge remote branch 'upstream/master' into PM-1072

2015-05-15 11:04:44 -04:00
parent caab76e1a3 3904a6534b
commit f3779a98b4
37 changed files with 226 additions and 56 deletions
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -2820,7 +2820,7 @@ function PMFAddCaseNote($caseUid, $processUid, $taskUid, $userUid, $note, $sendM
 function PMFAddAttachmentToArray($arrayData, $index, $value, $suffix = " Copy({i})")
 {
    if (isset($suffix) && $suffix == "") {
-        $suffix = " Copy ({i})";
+        $suffix = " Copy({i})";
    }

    $newIndex = $index;