From 7048077184c9b5a1d2cf6fca188099998b64eb4f Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Sun, 19 Oct 2008 00:18:55 +0000
Subject: [PATCH] API CHANGE Removed HtmlOneLineField. This field has been
 deprecated for some time now, and it does not work. API CHANGE Changed
 HTMLVarchar->scaffoldFormField() to use HtmlEditorField instead of
 HtmlOneLineField, which does not work.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64504 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/fieldtypes/HTMLVarchar.php |  2 +-
 forms/HtmlOneLineField.php            | 30 ---------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100755 forms/HtmlOneLineField.php

diff --git a/core/model/fieldtypes/HTMLVarchar.php b/core/model/fieldtypes/HTMLVarchar.php
index 1c44addfe..739ab3e8c 100755
--- a/core/model/fieldtypes/HTMLVarchar.php
+++ b/core/model/fieldtypes/HTMLVarchar.php
@@ -9,7 +9,7 @@
 class HTMLVarchar extends Varchar {
 	
 	public function scaffoldFormField($title = null, $params = null) {
-		return new HtmlOneLineField($this->name, $title);
+		return new HtmlEditorField($this->name, $title, 1);
 	}
 	
 	public function scaffoldSearchField($title = null) {
diff --git a/forms/HtmlOneLineField.php b/forms/HtmlOneLineField.php
deleted file mode 100755
index f07c8b628..000000000
--- a/forms/HtmlOneLineField.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * A WYSIWYG editor field, powered by tinymce.
- * tinymce editor fields are created from <textarea> tags which are then converted with javascript.
- * The {@link Requirements} system is used to ensure that all necessary javascript is included.
- * @package forms
- * Caution: Only works within the CMS with a global tinymce-menubar, see {@link CMSMain}
- * 
- * @subpackage fields-formattedinput
- * @deprecated 2.3 It's not clear that this field works properly.  Just use {@link HtmlEditorField}.
- */
-class HtmlOneLineField extends TextField {
-	/**
-	 * Returns the a <textarea> field with tinymce="true" set on it
-	 */
-	function Field() {
-		Requirements::javascript(MCE_ROOT . "tiny_mce_src.js");
-		Requirements::javascript(THIRDPARTY_DIR . "/tiny_mce_improvements.js");
-
-		// Don't allow unclosed tags - they will break the whole application ;-)		
-		$cleanVal = $this->value;
-		$lPos = strrpos($cleanVal,'<');
-		$rPos = strrpos($cleanVal,'>');
-		if(($lPos > $rPos) || ($rPos === false && $lPos !== false)) $cleanVal .= '>';
-		
-		return "<textarea class=\"htmleditor\" tinymce_oneline=\"true\" id=\"" . $this->id() . "\" name=\"{$this->name}\" rows=\"1\">$cleanVal</textarea>";
-	}
-}
-
-?>
\ No newline at end of file