Merge remote-tracking branch 'origin/4.2' into 4.3

silverstripe · Jun 13, 2017 · 728647c · 728647c
2 parents 27b8ef3 + fe98baf
commit 728647c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/code/model/editableformfields/EditableCheckboxGroupField.php b/code/model/editableformfields/EditableCheckboxGroupField.php
@@ -24,7 +24,7 @@ public function getFormField()
         // Set the default checked items
         $defaultCheckedItems = $this->getDefaultOptions();
         if ($defaultCheckedItems->count()) {
-            $field->setDefaultItems($defaultCheckedItems->map('EscapedTitle')->keys());
+            $field->setDefaultItems($defaultCheckedItems->map('Value')->keys());
         }
 
         $this->doUpdateFormField($field);

diff --git a/code/model/editableformfields/EditableDropdown.php b/code/model/editableformfields/EditableDropdown.php
@@ -62,7 +62,7 @@ public function getFormField()
         // Set default
         $defaultOption = $this->getDefaultOptions()->first();
         if ($defaultOption) {
-            $field->setValue($defaultOption->EscapedTitle);
+            $field->setValue($defaultOption->Value);
         }
         $this->doUpdateFormField($field);
         return $field;

diff --git a/code/model/editableformfields/EditableOption.php b/code/model/editableformfields/EditableOption.php
@@ -75,12 +75,16 @@ public function canDelete($member = null)
 		return $this->canEdit($member);
 	}
 
+	/**
+	 * @deprecated 5.0 Use "$Title.XML" in templates instead
+	 * @return string
+	 */
     public function getEscapedTitle()
     {
 		return Convert::raw2att($this->Title);
 	}
 
-    /**
+	/**
      * @param Member $member
      * @return bool
      */

diff --git a/code/model/editableformfields/EditableRadioField.php b/code/model/editableformfields/EditableRadioField.php
@@ -34,7 +34,7 @@ public function getFormField()
         // Set default item
         $defaultOption = $this->getDefaultOptions()->first();
         if ($defaultOption) {
-            $field->setValue($defaultOption->EscapedTitle);
+            $field->setValue($defaultOption->Value);
         }
         $this->doUpdateFormField($field);
         return $field;