From e8aeb692fdeed8acae1a812b19dd660d93317768 Mon Sep 17 00:00:00 2001
From: Jyrki Lilja <jyrki.lilja@focus.fi>
Date: Wed, 8 May 2013 10:08:21 +0300
Subject: [PATCH] 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());
+    }
+}