diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php index 4a080b9..6b8c70f 100755 --- a/code/model/UserDefinedForm.php +++ b/code/model/UserDefinedForm.php @@ -411,7 +411,9 @@ class UserDefinedForm_Controller extends Page_Controller if ($this->Content && $form = $this->Form()) { $hasLocation = stristr($this->Content, '$UserDefinedForm'); if ($hasLocation) { - $content = preg_replace('/(]*>)?\\$UserDefinedForm(<\\/p>)?/i', $form->forTemplate(), $this->Content); + /** @see Requirements_Backend::escapeReplacement */ + $formEscapedForRegex = addcslashes($form->forTemplate(), '\\$'); + $content = preg_replace('/(]*>)?\\$UserDefinedForm(<\\/p>)?/i', $formEscapedForRegex, $this->Content); return array( 'Content' => DBField::create_field('HTMLText', $content), 'Form' => "" diff --git a/templates/forms/UserFormsCheckboxSetField.ss b/templates/forms/UserFormsCheckboxSetField.ss index 290fd78..b35cf41 100644 --- a/templates/forms/UserFormsCheckboxSetField.ss +++ b/templates/forms/UserFormsCheckboxSetField.ss @@ -3,7 +3,7 @@
checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> /> - +
<% end_loop %> <% else %>