From c5ac342d9baaa9818c342d306e8955f990d22cc9 Mon Sep 17 00:00:00 2001
From: "Bradley M. Froehle" <brad.froehle@gmail.com>
Date: Mon, 21 Nov 2011 12:27:59 -0800
Subject: [PATCH] Issue #1273722 by bfroehle: Fix FieldAttachTestCase::setUp()
 signature.

---
 core/modules/field/tests/field.test |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/modules/field/tests/field.test b/core/modules/field/tests/field.test
index 214eab4..24b6d92 100644
--- a/core/modules/field/tests/field.test
+++ b/core/modules/field/tests/field.test
@@ -72,12 +72,13 @@ class FieldTestCase extends DrupalWebTestCase {
 }
 
 class FieldAttachTestCase extends FieldTestCase {
-  function setUp($modules = array()) {
+  function setUp() {
     // Since this is a base class for many test cases, support the same
     // flexibility that DrupalWebTestCase::setUp() has for the modules to be
     // passed in as either an array or a variable number of string arguments.
-    if (!is_array($modules)) {
-      $modules = func_get_args();
+    $modules = func_get_args();
+    if (isset($modules[0]) && is_array($modules[0])) {
+      $modules = $modules[0];
     }
     if (!in_array('field_test', $modules)) {
       $modules[] = 'field_test';
-- 
1.7.7.2

