From 382f34c69baaeb27df1a2d4d8030cdc3b3e8832b Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 11 Aug 2008 03:10:59 +0000
Subject: [PATCH] (merged from branches/roa. use "svn log -c <changeset> -g
 <module-svn-path>" for detailed commit message)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60335 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 dev/TestRunner.php   |  3 ---
 forms/FieldGroup.php | 12 +++++-------
 security/Member.php  |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dev/TestRunner.php b/dev/TestRunner.php
index 43fb0fc65..805c6523a 100644
--- a/dev/TestRunner.php
+++ b/dev/TestRunner.php
@@ -58,7 +58,6 @@ class TestRunner extends Controller {
 	 * Run all test classes
 	 */
 	function all() {
-		die("here");
 		if(hasPhpUnit()) {
 			$tests = ClassInfo::subclassesFor('SapphireTest');
 			array_shift($tests);
@@ -127,10 +126,8 @@ class TestRunner extends Controller {
 		$results = new PHPUnit_Framework_TestResult();		
 		$results->addListener($reporter);
 
-		/*, array("reportDirectory" => "/Users/sminnee/phpunit-report")*/
 		if($coverage) {
 			$suite->run($results);
-			//$testResult = PHPUnit_TextUI_TestRunner::run($suite, array("reportDirectory" => "../assets/coverage-report"));
 			$coverageURL = Director::absoluteURL('assets/coverage-report');
 			echo "<p><a href=\"$coverageURL\">Coverage report available here</a></p>";
 		} else {
diff --git a/forms/FieldGroup.php b/forms/FieldGroup.php
index 6eb265948..96dd4ef68 100755
--- a/forms/FieldGroup.php
+++ b/forms/FieldGroup.php
@@ -57,18 +57,16 @@ class FieldGroup extends CompositeField {
 	 * it is easier to overwrite the <div class="field"> behaviour in a more specific class
 	 */
 	function Field() {
-		$subfieldParam = $this->subfieldParam;
-		
 		$fs = $this->FieldSet();
     	$spaceZebra = isset($this->zebra) ? " $this->zebra" : '';
     	$idAtt = isset($this->id) ? " id=\"{$this->id}\"" : '';
-		$content = "<span class=\"fieldgroup$spaceZebra\"$idAtt>";
+		$content = "<div class=\"fieldgroup$spaceZebra\"$idAtt>";
 		foreach($fs as $subfield) {
-	      $childZebra = (!isset($childZebra) || $childZebra == "odd") ? "even" : "odd";
-	      if($subfield->hasMethod('setZebra')) $subfield->setZebra($childZebra);
-			$content .= $subfield->$subfieldParam() . " ";
+			$childZebra = (!isset($childZebra) || $childZebra == "odd") ? "even" : "odd";
+			if($subfield->hasMethod('setZebra')) $subfield->setZebra($childZebra);
+			$content .= "<div class=\"fieldgroupField\">" . $subfield->{$this->subfieldParam}() . "</div>";
 		}
-		$content .= "</span>";
+		$content .= "</div>";
 		return $content;
 	}
 	
diff --git a/security/Member.php b/security/Member.php
index 9f31c2f9a..c50ac92de 100644
--- a/security/Member.php
+++ b/security/Member.php
@@ -699,7 +699,7 @@ $_REQUEST['showqueries'] = 1;
 	public function Groups() {
 		$groups = $this->getManyManyComponents("Groups");
 
-		$unsecure = DataObject::get("Group_Unsecure", "");
+		$unsecure = DataObject::get("Group_Unsecure");
 		if($unsecure) {
 			foreach($unsecure as $unsecureItem) {
 				$groups->push($unsecureItem);