From e8aeb692fdeed8acae1a812b19dd660d93317768 Mon Sep 17 00:00:00 2001 From: Jyrki Lilja Date: Wed, 8 May 2013 10:08:21 +0300 Subject: [PATCH 1/3] BUG: Fix checkbox group with " in option titles. --- code/model/formfields/EditableCheckboxGroupField.php | 8 ++++---- code/model/formfields/EditableOption.php | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/code/model/formfields/EditableCheckboxGroupField.php b/code/model/formfields/EditableCheckboxGroupField.php index da15656..81ac630 100755 --- a/code/model/formfields/EditableCheckboxGroupField.php +++ b/code/model/formfields/EditableCheckboxGroupField.php @@ -16,9 +16,9 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField { public function getFormField() { $optionSet = $this->Options(); $options = array(); - - $optionMap = ($optionSet) ? $optionSet->map('Title', 'Title') : array(); - + + $optionMap = ($optionSet) ? $optionSet->map('EscapedTitle', 'Title') : array(); + return new CheckboxSetField($this->Name, $this->Title, $optionMap); } @@ -40,4 +40,4 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField { } return $result; } -} \ No newline at end of file +} diff --git a/code/model/formfields/EditableOption.php b/code/model/formfields/EditableOption.php index 2edf132..9a9ac5c 100644 --- a/code/model/formfields/EditableOption.php +++ b/code/model/formfields/EditableOption.php @@ -70,4 +70,8 @@ class EditableOption extends DataObject { $this->readonly = true; return $this->EditSegment(); } -} \ No newline at end of file + + public function getEscapedTitle() { + return Convert::raw2att(parent::getTitle()); + } +} From 0b0834c873b1642bd2d7becfa9874ecd80a1a57f Mon Sep 17 00:00:00 2001 From: Jyrki Lilja Date: Tue, 4 Jun 2013 08:20:03 +0300 Subject: [PATCH 2/3] BUG: Fix radio field with " in Title. --- code/model/formfields/EditableRadioField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/formfields/EditableRadioField.php b/code/model/formfields/EditableRadioField.php index 4ccaa98..e9c951a 100755 --- a/code/model/formfields/EditableRadioField.php +++ b/code/model/formfields/EditableRadioField.php @@ -19,7 +19,7 @@ class EditableRadioField extends EditableMultipleOptionField { if($optionSet) { foreach( $optionSet as $option ) { - $options[$option->Title] = $option->Title; + $options[$option->EscapedTitle] = $option->Title; } } From 896e8591f75cde4332241d4a6d6cd02dc4915bdd Mon Sep 17 00:00:00 2001 From: Jyrki Lilja Date: Tue, 4 Jun 2013 09:17:23 +0300 Subject: [PATCH 3/3] BUG: Use $this->Title correctly. --- code/model/formfields/EditableOption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/model/formfields/EditableOption.php b/code/model/formfields/EditableOption.php index 9a9ac5c..8dc5894 100644 --- a/code/model/formfields/EditableOption.php +++ b/code/model/formfields/EditableOption.php @@ -72,6 +72,6 @@ class EditableOption extends DataObject { } public function getEscapedTitle() { - return Convert::raw2att(parent::getTitle()); + return Convert::raw2att($this->Title); } }