Merge branch '3.0' into 3.1

silverstripe · Sep 23, 2016 · eed799d · eed799d
2 parents ca2a6a3 + dec9356
commit eed799d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/code/model/editableformfields/EditableFormField.php b/code/model/editableformfields/EditableFormField.php
@@ -81,6 +81,11 @@ class EditableFormField extends DataObject {
 		"RightTitle" => "Varchar(255)", // from CustomSettings
 		"ShowOnLoad" => "Boolean(1)", // from CustomSettings
 	);
+
+	private static $defaults = array(
+		'ShowOnLoad' => true,
+	);
+
 
 	/**
 	 * @config

diff --git a/code/model/editableformfields/EditableFormHeading.php b/code/model/editableformfields/EditableFormHeading.php
@@ -56,7 +56,8 @@ public function getCMSFields() {
 	}
 
 	public function getFormField() {
-		$labelField = new HeaderField($this->Name, $this->EscapedTitle, $this->Level);
+		$labelField = HeaderField::create($this->EscapedTitle)
+            ->setHeadingLevel($this->Level);
 		$labelField->addExtraClass('FormHeading');
 		$labelField->setAttribute('data-id', $this->Name);
 		$this->doUpdateFormField($labelField);