- Patch #348448 by mfb, c960657, marvil07, cdale, jpmckinney: fixed PHP strict warnings when running tests and for PHP 5.3.

1 files changed, 2 insertions, 3 deletions

diff --git a/modules/color/color.test b/modules/color/color.test
index d487be24b..43cdb4aa2 100644
--- a/modules/color/color.test
+++ b/modules/color/color.test
@@ -37,9 +37,8 @@ class ColorTestCase extends DrupalWebTestCase {
     $edit['palette[link]'] = '#123456';
     $this->drupalPost('admin/appearance/settings/garland', $edit, t('Save configuration'));
 
-    global $theme_key;
     $this->drupalGet('<front>');
-    $stylesheets = variable_get('color_' . $theme_key . '_stylesheets', array());
+    $stylesheets = variable_get('color_garland_stylesheets', array());
     $this->assertPattern('|' . file_create_url($stylesheets[0]) . '|', 'Make sure the color stylesheet is included in the content.');
 
     $stylesheet_content = join("\n", file($stylesheets[0]));
@@ -52,7 +51,7 @@ class ColorTestCase extends DrupalWebTestCase {
     $this->drupalPost('admin/appearance/settings/garland', $edit, t('Save configuration'));
 
     $this->drupalGet('<front>');
-    $stylesheets = variable_get('color_' . $theme_key . '_stylesheets', array());
+    $stylesheets = variable_get('color_garland_stylesheets', array());
     $stylesheet_content = join("\n", file($stylesheets[0]));
     $matched = preg_match('/(.*color: #0c7a00.*)/i', $stylesheet_content, $matches);
     $this->assertTrue($matched == 1, 'Make sure the color we changed is in the color stylesheet.');