tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4'

This commit is contained in:
Robbie Averill 2017-09-26 11:30:56 +13:00
parent bb8f9173ec 17bbf2b75d
commit c6ad8648fd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Model/UserDefinedFormController.php
View File

@ -110,9 +110,11 @@ class UserDefinedFormController extends PageController
if ($this->Content && $form = $this->Form()) { if ($this->Content && $form = $this->Form()) {
$hasLocation = stristr($this->Content, '$UserDefinedForm'); $hasLocation = stristr($this->Content, '$UserDefinedForm');
if ($hasLocation) { if ($hasLocation) {
/** @see Requirements_Backend::escapeReplacement */
$formEscapedForRegex = addcslashes($form->forTemplate(), '\\$');
$content = preg_replace( $content = preg_replace(
'/(<p[^>]*>)?\\$UserDefinedForm(<\\/p>)?/i', '/(<p[^>]*>)?\\$UserDefinedForm(<\\/p>)?/i',
$form->forTemplate(), $formEscapedForRegex,
$this->Content $this->Content
); );
return [ return [

2
templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
View File

@ -3,7 +3,7 @@
<div class="$Class"> <div class="$Class">
<input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %> <input id="$ID" class="checkbox" name="$Name" type="checkbox" value="$Value.ATT"<% if $isChecked %>
checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> /> checked="checked"<% end_if %><% if $isDisabled %> disabled="disabled"<% end_if %> />
<label for="$ID">$Title</label> <label for="$ID">$Title.XML</label>
</div> </div>
<% end_loop %> <% end_loop %>
<% else %> <% else %>