- Patch #865072 by bleen18, jhodgdon: updates to reflect that Bartik is default theme now.

3 files changed, 11 insertions, 12 deletions

diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index ee3ac5786..2ddc75ac4 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -11,7 +11,7 @@
  * - $base_path: The base URL path of the Drupal installation. At the very
  *   least, this will always default to /.
  * - $directory: The directory the template is located in, e.g. modules/system
- *   or themes/garland.
+ *   or themes/bartik.
  * - $is_front: TRUE if the current page is the front page.
  * - $logged_in: TRUE if the user is registered and signed in.
  * - $is_admin: TRUE if the user has permission to access administration pages.
diff --git a/modules/system/system.test b/modules/system/system.test
index 1d665bf94..42a9d0635 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1045,7 +1045,6 @@ class PageTitleFiltering extends DrupalWebTestCase {
     $this->assertRaw($title_filtered . '</title>', 'Check for the filtered version of the title.');
 
     // Test the slogan.
-    // Currently Garland is not displaying the slogan so this test is escaped.
     $this->assertNoRaw($slogan, 'Check for the unfiltered version of the slogan.');
     $this->assertRaw($slogan_filtered, 'Check for the filtered version of the slogan.');
   }
@@ -1296,22 +1295,22 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
     variable_set('theme_default', 'stark');
     // Enable an administration theme and show it on the node admin pages.
     $edit = array(
-      'admin_theme' => 'garland',
+      'admin_theme' => 'seven',
       'node_admin_theme' => TRUE,
     );
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin/config');
-    $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
+    $this->assertRaw('themes/seven', t('Administration theme used on an administration page.'));
 
     $this->drupalGet('node/' . $this->node->nid);
     $this->assertRaw('themes/stark', t('Site default theme used on node page.'));
 
     $this->drupalGet('node/add');
-    $this->assertRaw('themes/garland', t('Administration theme used on the add content page.'));
+    $this->assertRaw('themes/seven', t('Administration theme used on the add content page.'));
 
     $this->drupalGet('node/' . $this->node->nid . '/edit');
-    $this->assertRaw('themes/garland', t('Administration theme used on the edit content page.'));
+    $this->assertRaw('themes/seven', t('Administration theme used on the edit content page.'));
 
     // Disable the admin theme on the node admin pages.
     $edit = array(
@@ -1320,13 +1319,13 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin/config');
-    $this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
+    $this->assertRaw('themes/seven', t('Administration theme used on an administration page.'));
 
     $this->drupalGet('node/add');
     $this->assertRaw('themes/stark', t('Site default theme used on the add content page.'));
 
     // Reset to the default theme settings.
-    variable_set('theme_default', 'garland');
+    variable_set('theme_default', 'bartik');
     $edit = array(
       'admin_theme' => '0',
       'node_admin_theme' => FALSE,
@@ -1334,10 +1333,10 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
     $this->drupalPost('admin/appearance', $edit, t('Save configuration'));
 
     $this->drupalGet('admin');
-    $this->assertRaw('themes/garland', t('Site default theme used on administration page.'));
+    $this->assertRaw('themes/bartik', t('Site default theme used on administration page.'));
 
     $this->drupalGet('node/add');
-    $this->assertRaw('themes/garland', t('Site default theme used on the add content page.'));
+    $this->assertRaw('themes/bartik', t('Site default theme used on the add content page.'));
   }
 }
 
diff --git a/modules/system/theme.api.php b/modules/system/theme.api.php
index c84838ee1..5bad49a75 100644
--- a/modules/system/theme.api.php
+++ b/modules/system/theme.api.php
@@ -56,9 +56,9 @@
  * themes utilizing an engine will have their well-named theming functions
  * automatically registered for them. While this can vary based upon the theme
  * engine, the standard set by phptemplate is that theme functions should be
- * named THEMENAME_HOOK. For example, for Drupal's default theme (Garland) to
+ * named THEMENAME_HOOK. For example, for Drupal's default theme (Bartik) to
  * implement the 'table' hook, the phptemplate.engine would find
- * garland_table().
+ * bartik_table().
  *
  * The theme system is described and defined in theme.inc.
  *