diff --git a/lib/filter/filter.class.php b/lib/filter/filter.class.php index 7a24ee06cd..3c92af1281 100644 --- a/lib/filter/filter.class.php +++ b/lib/filter/filter.class.php @@ -60,6 +60,7 @@ class fixer extends baseFixer } if($canImplode) $this->data->$field = implode(',', $value); } + if(isset($flowFields[$field]) and $flowFields[$field]->control == 'textarea') $this->skipSpecial($field); $this->specialChars($field); } diff --git a/module/bug/model.php b/module/bug/model.php index 18fe679913..4f7829fc60 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -779,7 +779,7 @@ class bugModel extends model foreach($extendFields as $extendField) { - $bug->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$i]); + $bug->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$bugID]); $message = $this->checkFlowRule($extendField, $bug->{$extendField->field}); if($message) die(js::alert($message)); } diff --git a/module/story/model.php b/module/story/model.php index 72dc3c455d..d45c3f73c3 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -882,7 +882,7 @@ class storyModel extends model foreach($extendFields as $extendField) { - $story->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$i]); + $story->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$storyID]); $message = $this->checkFlowRule($extendField, $story->{$extendField->field}); if($message) die(js::alert($message)); } diff --git a/module/task/model.php b/module/task/model.php index ada7448de2..945368a6f3 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -984,7 +984,7 @@ class taskModel extends model foreach($extendFields as $extendField) { - $task->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$i]); + $task->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$taskID]); $message = $this->checkFlowRule($extendField, $task->{$extendField->field}); if($message) die(js::alert($message)); } diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 9219ce2d2d..8e70dd22e9 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -96,7 +96,7 @@ $teamAccounts = array_keys($teams[$taskID]); foreach($teamAccounts as $teamAccount) { - $taskMembers[] = $members[$teamAccount]; + $taskMembers[$teamAccount] = $members[$teamAccount]; } } else diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index bdabdf5ae1..1e544639bd 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -129,7 +129,7 @@ $teamAccounts = array_keys($task->team); foreach($teamAccounts as $teamAccount) { - $taskMembers[] = $members[$teamAccount]; + $taskMembers[$teamAccount] = $members[$teamAccount]; } } else diff --git a/module/testcase/model.php b/module/testcase/model.php index 796a9f77f1..d35829d858 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -871,7 +871,7 @@ class testcaseModel extends model foreach($extendFields as $extendField) { - $case->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$i]); + $case->{$extendField->field} = htmlspecialchars($this->post->{$extendField->field}[$caseID]); $message = $this->checkFlowRule($extendField, $case->{$extendField->field}); if($message) die(js::alert($message)); }