From eeb79fde9c286c7181c460bdc4f98332e68e8be7 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 18 Oct 2007 01:06:21 +0000
Subject: [PATCH] FEATURE: respect $extraClass BUGFIX: overloaded FieldHolder()
 to avoid DefaultFieldHolder.ss usage

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43559 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/ConfirmedFormAction.php | 2 +-
 forms/FormAction.php          | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/forms/ConfirmedFormAction.php b/forms/ConfirmedFormAction.php
index d32f041a9..6d14ec7c1 100755
--- a/forms/ConfirmedFormAction.php
+++ b/forms/ConfirmedFormAction.php
@@ -19,7 +19,7 @@ class ConfirmedFormAction extends FormAction {
 		parent::__construct($action, $title, $form);
 	}
 	function Field() {
-		return "<input class=\"action\" id=\"" . $this->id() . "\" type=\"submit\" name=\"{$this->name}\" value=\"{$this->title}\" onclick=\"return confirm('$this->confirmation')\" />";
+		return "<input class=\"action " . $this->extraClass() . "\" id=\"" . $this->id() . "\" type=\"submit\" name=\"{$this->name}\" value=\"{$this->title}\" onclick=\"return confirm('$this->confirmation');\" />";
 	}
 }
 
diff --git a/forms/FormAction.php b/forms/FormAction.php
index ac9afe857..d7f63a8a0 100755
--- a/forms/FormAction.php
+++ b/forms/FormAction.php
@@ -32,6 +32,13 @@ class FormAction extends FormField {
 		return $this->extraData;
 	}
 	
+	/**
+	 * Avoid rendering with DefaultFieldHolder (renders <label>-tags etc.)
+	 */
+	function FieldHolder() {
+		return $this->Field();
+	}
+	
 	function Field() {
 		$titleAttr = $this->description ? "title=\"" . Convert::raw2att($this->description) . "\"" : '';
 		return "<input class=\"action" . $this->extraClass() . "\" id=\"" . $this->id() . "\" type=\"submit\" name=\"{$this->name}\" value=\"" . $this->attrTitle() . "\" $titleAttr />";