From 67cc18f5bf6943b0dec8c87ef3745693baca050a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Wed, 23 Mar 2011 15:38:31 +1300
Subject: [PATCH] MINOR Optional dependency on ThumbnailStripField in
 HtmlEditorField, preparing the split of this field into a "basic" and "cms"
 version

---
 forms/HtmlEditorField.php           |  8 ++++++++
 tests/forms/HtmlEditorFieldTest.php | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index dd14daf99..74918bf09 100755
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -288,6 +288,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 	 * @return Form
 	 */
 	function ImageForm() {
+		if(!class_exists('ThumbnailStripField')) {
+			throw new Exception('ThumbnailStripField class required for HtmlEditorField->ImageForm()');
+		}
+		
 		$fields = new FieldSet(
 			new LiteralField(
 				'Heading', 
@@ -348,6 +352,10 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 	}
 
 	function FlashForm() {
+		if(!class_exists('ThumbnailStripField')) {
+			throw new Exception('ThumbnailStripField class required for HtmlEditorField->FlashForm()');
+		}
+		
 		$form = new Form(
 			$this->controller,
 			"{$this->name}/FlashForm", 
diff --git a/tests/forms/HtmlEditorFieldTest.php b/tests/forms/HtmlEditorFieldTest.php
index 6fc0efce4..2c9bbe62b 100755
--- a/tests/forms/HtmlEditorFieldTest.php
+++ b/tests/forms/HtmlEditorFieldTest.php
@@ -77,13 +77,18 @@ class HtmlEditorFieldTest extends FunctionalTest {
 	}
 
 	public function testExtendImageFormFields() {
-		$controller = new Controller();
+		if(class_exists('ThumbnailStripField')) {
+			$controller = new Controller();
 
-		$toolbar = new HtmlEditorField_Toolbar($controller, 'DummyToolbar');
+			$toolbar = new HtmlEditorField_Toolbar($controller, 'DummyToolbar');
 
-		$imageForm = $toolbar->ImageForm();
-		$this->assertTrue(HtmlEditorFieldTest_DummyImageFormFieldExtension::$update_called);
-		$this->assertEquals($imageForm->Fields(), HtmlEditorFieldTest_DummyImageFormFieldExtension::$fields);
+			$imageForm = $toolbar->ImageForm();
+			$this->assertTrue(HtmlEditorFieldTest_DummyImageFormFieldExtension::$update_called);
+			$this->assertEquals($imageForm->Fields(), HtmlEditorFieldTest_DummyImageFormFieldExtension::$fields);
+		} else {
+			$this->markTestSkipped('Test requires cms module (ThumbnailStripfield class)');
+		}
+		
 	}
 }