From 0d39a888a14beae4da172dc10466366d3e58eeae Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Tue, 29 Mar 2011 17:55:13 +1300
Subject: [PATCH] MINOR Removed references to ContentController from
 documentatin

---
 forms/ComplexTableField.php        | 2 +-
 forms/HasManyComplexTableField.php | 2 +-
 forms/Validator.php                | 2 +-
 search/FulltextSearchable.php      | 3 ++-
 tests/ObjectTest.php               | 2 --
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php
index 3f3c6406a..19c24c52f 100644
--- a/forms/ComplexTableField.php
+++ b/forms/ComplexTableField.php
@@ -193,7 +193,7 @@ class ComplexTableField extends TableListField {
 	/**
 	 * See class comments
 	 *
-	 * @param ContentController $controller
+	 * @param Controller $controller
 	 * @param string $name
 	 * @param string $sourceClass
 	 * @param array $fieldList
diff --git a/forms/HasManyComplexTableField.php b/forms/HasManyComplexTableField.php
index 37499f09d..b60183cde 100644
--- a/forms/HasManyComplexTableField.php
+++ b/forms/HasManyComplexTableField.php
@@ -76,7 +76,7 @@ class HasManyComplexTableField extends ComplexTableField {
 	 */
 	function controllerClass() {
 		if($this->controller instanceof DataObject) return $this->controller->class;
-		elseif($this->controller instanceof ContentController) return $this->controller->data()->class;
+		elseif($this->controller instanceof Controller) return $this->controller->data()->class;
 	}
 		
 	function getControllerID() {
diff --git a/forms/Validator.php b/forms/Validator.php
index 9c271087d..b6c48648a 100755
--- a/forms/Validator.php
+++ b/forms/Validator.php
@@ -40,7 +40,7 @@ abstract class Validator extends Object {
 	
 	/**
 	 * Call this function to set the javascript validation handler for all valdiation on your site.
-	 * This could be called from _config.php to set site-wide javascript validation, or from ContentController::init()
+	 * This could be called from _config.php to set site-wide javascript validation, or from Controller::init()
 	 * to affect only the front-end site.
 	 * Use instance method {@link setJavascriptValidationHandler()} to
 	 * only set handler for a specific form instance.
diff --git a/search/FulltextSearchable.php b/search/FulltextSearchable.php
index d43494d14..0e750993d 100644
--- a/search/FulltextSearchable.php
+++ b/search/FulltextSearchable.php
@@ -2,7 +2,8 @@
 /**
  * Provides a simple search engine for your site based on the MySQL FULLTEXT index.
  * Adds the {@link FulltextSearchable} extension to data classes,
- * as well as the {@link ContentControllerSearchExtension} to {@link ContentController}.
+ * as well as the {@link ContentControllerSearchExtension} to {@link ContentController}
+ * (if the 'cms' module is available as well).
  * (this means you can use $SearchForm in your template without changing your own implementation).
  * 
  * @see http://doc.silverstripe.org/tutorial:4-site-search
diff --git a/tests/ObjectTest.php b/tests/ObjectTest.php
index 2807f165c..f614bccb2 100755
--- a/tests/ObjectTest.php
+++ b/tests/ObjectTest.php
@@ -22,8 +22,6 @@ class ObjectTest extends SapphireTest {
 		$this->assertTrue($obj->hasMethod('extendableMethod'), "Extension method found in original spelling");
 		$this->assertTrue($obj->hasMethod('ExTendableMethod'), "Extension method found case-insensitive");
 		
-		/* The above examples make use of SiteTree, Versioned and ContentController.  Let's test defineMethods() more
-		 * directly, with some sample objects */
 		$objs = array();
 		$objs[] = new ObjectTest_T2();
 		$objs[] = new ObjectTest_T2();