diff --git a/code/Model/UserDefinedFormController.php b/code/Model/UserDefinedFormController.php index eed8955..44711d3 100644 --- a/code/Model/UserDefinedFormController.php +++ b/code/Model/UserDefinedFormController.php @@ -110,9 +110,11 @@ class UserDefinedFormController extends PageController if ($this->Content && $form = $this->Form()) { $hasLocation = stristr($this->Content, '$UserDefinedForm'); if ($hasLocation) { + /** @see Requirements_Backend::escapeReplacement */ + $formEscapedForRegex = addcslashes($form->forTemplate(), '\\$'); $content = preg_replace( '/(]*>)?\\$UserDefinedForm(<\\/p>)?/i', - $form->forTemplate(), + $formEscapedForRegex, $this->Content ); return [ diff --git a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss index 290fd78..b35cf41 100644 --- a/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss +++ b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss @@ -3,7 +3,7 @@
checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> /> - +
<% end_loop %> <% else %>