From ef3953fc68489c18e15ea9fbed97705b72abf2fd Mon Sep 17 00:00:00 2001
From: "edchipman@gmail.com" <edchipman@gmail.com>
Date: Sun, 22 Apr 2012 16:25:26 -0300
Subject: [PATCH] Replaced instances of new DataObjectSet() with new
 ArrayList()

Removed Validator::set_javascript_validation_handler() call
---
 code/model/UserDefinedForm.php              | 9 +++------
 code/model/formfields/EditableFormField.php | 6 +++---
 tests/EditableFormFieldTest.php             | 2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index a97cae0..9829255 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -293,9 +293,6 @@ class UserDefinedForm_Controller extends Page_Controller {
 	public function init() {
 		parent::init();
 		
-		// block prototype validation
-		Validator::set_javascript_validation_handler('none');
-		
 		// load the jquery
 		Requirements::javascript(FRAMEWORK_DIR .'/thirdparty/jquery/jquery.js');
 		Requirements::javascript('userforms/thirdparty/jquery-validate/jquery.validate.min.js');
@@ -314,14 +311,14 @@ class UserDefinedForm_Controller extends Page_Controller {
 			if($hasLocation) {
 				$content = str_ireplace('$UserDefinedForm', $form->forTemplate(), $this->Content);
 				return array(
-					'Content' => DBField::create('HTMLText', $content),
+					'Content' => DBField::create_field('HTMLText', $content),
 					'Form' => ""
 				);
 			}
 		}
 
 		return array(
-			'Content' => DBField::create('HTMLText', $this->Content),
+			'Content' => DBField::create_field('HTMLText', $this->Content),
 			'Form' => $this->Form()
 		);
 	}
@@ -678,7 +675,7 @@ JS
 		$values = array();
         $attachments = array();
 
-		$submittedFields = new DataObjectSet();
+		$submittedFields = new ArrayList();
 		
 		foreach($this->Fields() as $field) {
 			
diff --git a/code/model/formfields/EditableFormField.php b/code/model/formfields/EditableFormField.php
index e001986..c1cbd7f 100755
--- a/code/model/formfields/EditableFormField.php
+++ b/code/model/formfields/EditableFormField.php
@@ -225,14 +225,14 @@ class EditableFormField extends DataObject {
 	 * @return DataObjectSet
 	 */
 	public function CustomRules() {
-		$output = new DataObjectSet();
+		$output = new ArrayList();
 		$fields = $this->Parent()->Fields();
 
 		// check for existing ones
 		if($rules = $this->Dependencies()) {
 			foreach($rules as $rule => $data) {
 				// recreate all the field object to prevent caching
-				$outputFields = new DataObjectSet();
+				$outputFields = new ArrayList();
 				
 				foreach($fields as $field) {
 					$new = clone $field;
@@ -471,6 +471,6 @@ class EditableFormField extends DataObject {
 		
 		$errorMessage = ($this->CustomErrorMessage) ? $this->CustomErrorMessage : $standard;
 		
-		return DBField::create('Varchar', $errorMessage);
+		return DBField::create_field('Varchar', $errorMessage);
 	}
 }
diff --git a/tests/EditableFormFieldTest.php b/tests/EditableFormFieldTest.php
index 27e0000..ad993be 100644
--- a/tests/EditableFormFieldTest.php
+++ b/tests/EditableFormFieldTest.php
@@ -81,7 +81,7 @@ class EditableFormFieldTest extends FunctionalTest {
 	
 	function testPopulateFromPostData() {
 		$this->logInWithPermission('ADMIN');
-		$set = new DataObjectSet();
+		$set = new ArrayList();
 		
 		$field = new EditableFormField();