MINOR Removed $params argument to DataObject->getCMSFields(), please …

…use FormScaffolder directly (fixes #7135)
silverstripe-big-o · Apr 13, 2012 · dc0168d · dc0168d
1 parent b127419
commit dc0168d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/code/model/ErrorPage.php b/code/model/ErrorPage.php
@@ -129,8 +129,8 @@ function requireDefaultRecords() {
 		}
 	}
 
-	function getCMSFields($params = null) {
-		$fields = parent::getCMSFields($params);
+	function getCMSFields() {
+		$fields = parent::getCMSFields();
 
 		$fields->addFieldToTab(
 			"Root.Main", 

diff --git a/code/model/RedirectorPage.php b/code/model/RedirectorPage.php
@@ -117,7 +117,7 @@ function onBeforeWrite() {
 		}
 	}
 
-	function getCMSFields($params = null) {
+	function getCMSFields() {
 		Requirements::javascript(CMS_DIR . '/javascript/RedirectorPage.js');
 
 		$fields = parent::getCMSFields();

diff --git a/code/model/SiteConfig.php b/code/model/SiteConfig.php
@@ -41,7 +41,7 @@ public static function disable_theme($theme) {
 	 *
 	 * @return FieldList
 	 */
-	function getCMSFields($params = null) {
+	function getCMSFields() {
 		Requirements::javascript(CMS_DIR . "/javascript/SitetreeAccess.js");
 
 		$groupsMap = DataList::create('Group')->map('ID', 'Breadcrumbs')->toArray();

diff --git a/code/model/SiteTree.php b/code/model/SiteTree.php
@@ -1745,7 +1745,7 @@ function VirtualPages() {
 	 *
 	 * @return FieldList The fields to be displayed in the CMS.
 	 */
-	function getCMSFields($params = null) {
+	function getCMSFields() {
 		require_once("forms/Form.php");
 		// Status / message
 		// Create a status message for multiple parents

diff --git a/code/model/VirtualPage.php b/code/model/VirtualPage.php
@@ -165,8 +165,8 @@ public function isPublishable() {
 	/**
 	 * Generate the CMS fields from the fields from the original page.
 	 */
-	function getCMSFields($cms = null) {
-		$fields = parent::getCMSFields($cms);
+	function getCMSFields() {
+		$fields = parent::getCMSFields();
 
 		// Setup the linking to the original page.
 		$copyContentFromField = new TreeDropdownField(

diff --git a/code/widgets/Widget.php b/code/widgets/Widget.php
@@ -34,7 +34,7 @@ class Widget extends DataObject {
 	static $cmsTitle = "Name of this widget";
 	static $description = "Description of what this widget does.";
 
-	function getCMSFields($params = null) {
+	function getCMSFields() {
 		$fields = new FieldList();
 		$this->extend('updateCMSFields', $fields);
 		return $fields;

diff --git a/tests/controller/CMSMainTest.php b/tests/controller/CMSMainTest.php
@@ -114,7 +114,7 @@ function testThatGetCMSFieldsWorksOnEveryPageType() {
 			$page->flushCache();
 			$page = DataObject::get_by_id("SiteTree", $page->ID);
 
-			$this->assertTrue($page->getCMSFields(null) instanceof FieldList);
+			$this->assertTrue($page->getCMSFields() instanceof FieldList);
 		}
 	}
 

diff --git a/tests/widgets/WidgetAreaEditorTest.php b/tests/widgets/WidgetAreaEditorTest.php
@@ -460,7 +460,7 @@ class WidgetAreaEditorTest_TestWidget extends Widget implements TestOnly {
 	static $db = array(
 		'Title' => 'Varchar'
 	);
-	public function getCMSFields($params = null) {
+	public function getCMSFields() {
 		$fields = new FieldList();
 		$fields->push(new TextField('Title'));
 		return $fields;