From 5588646af30c044c9c47375ea1a14c2d27aa2a7b Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Sun, 10 May 2009 23:26:22 +0000
Subject: [PATCH] BUGFIX: updated editabletextfield to new userfield api

---
 code/editor/EditableTextField.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/code/editor/EditableTextField.php b/code/editor/EditableTextField.php
index e1f4909..7c9a838 100755
--- a/code/editor/EditableTextField.php
+++ b/code/editor/EditableTextField.php
@@ -12,7 +12,8 @@ class EditableTextField extends EditableFormField {
 	
 	static $plural_name = 'Text fields';
 	
-	function ExtraOptions() {
+	function getFieldConfiguration() {
+		$fields = parent::getFieldConfiguration();
 		
 		// eventually replace hard-coded "Fields"?
 		$baseName = "Fields[$this->ID]";
@@ -31,8 +32,8 @@ class EditableTextField extends EditableFormField {
 			new TextField($baseName . "[CustomSettings][Rows]", _t('EditableTextField.NUMBERROWS', 'Number of rows'), $rows)
 		);
 		
-		$extraFields->merge(parent::ExtraOptions());
-		return $extraFields;		
+		$fields->merge($extraFields);
+		return $fields;		
 	}
 
 	function getFormField() {