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

3 files changed, 6 insertions, 6 deletions

diff --git a/includes/common.inc b/includes/common.inc
index e2155870d..220414a2d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -2785,7 +2785,7 @@ function drupal_add_css($data = NULL, $options = NULL) {
  * module styles through CSS selectors.
  *
  * Themes may replace module-defined CSS files by adding a stylesheet with the
- * same filename. For example, themes/garland/system-menus.css would replace
+ * same filename. For example, themes/bartik/system-menus.css would replace
  * modules/system/system-menus.css. This allows themes to override complete
  * CSS files, rather than specific selectors, when necessary.
  *
@@ -6086,7 +6086,7 @@ function drupal_write_record($table, &$record, $primary_keys = array()) {
  * - stylesheets: Theme stylesheets eg: stylesheets[all][] = my-style.css
  * - scripts: Theme scripts eg: scripts[] = my-script.css
  *
- * @see garland.info
+ * @see bartik.info
  *
  * @param $filename
  *   The file we are parsing. Accepts file with relative or absolute path.
diff --git a/includes/theme.inc b/includes/theme.inc
index 5d8737943..eb7111a47 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -342,7 +342,7 @@ function drupal_theme_rebuild() {
  *   The loaded $theme object as returned from list_themes().
  * @param $path
  *   The directory where $name is. For example, modules/system or
- *   themes/garland.
+ *   themes/bartik.
  *
  * @see theme()
  * @see _theme_process_registry()
@@ -557,7 +557,7 @@ function _theme_build_registry($theme, $base_theme, $theme_engine) {
  *   - 'stylesheets': A two dimensional array, using the first key for the
  *     'media' attribute (e.g. 'all'), the second for the name of the file
  *     (e.g. style.css). The value is a complete filepath
- *     (e.g. themes/garland/style.css).
+ *     (e.g. themes/bartik/style.css).
  *   - 'scripts': An associative array of JavaScripts, using the filename as key
  *     and the complete filepath as value.
  *   - 'engine': The name of the theme engine.
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc
index 6049141f0..927499a8f 100644
--- a/includes/theme.maintenance.inc
+++ b/includes/theme.maintenance.inc
@@ -12,7 +12,7 @@
  * Used for site installs, updates and when the site is in maintenance mode.
  * It also applies when the database is unavailable or bootstrap was not
  * complete. Seven is always used for the initial install and update operations.
- * In other cases, Garland is used, but this can be overridden by setting a
+ * In other cases, Bartik is used, but this can be overridden by setting a
  * "maintenance_theme" key in the $conf variable in settings.php.
  */
 function _drupal_maintenance_theme() {
@@ -45,7 +45,7 @@ function _drupal_maintenance_theme() {
     }
 
     // We use the default theme as the maintenance theme. If a default theme
-    // isn't specified in the database or in settings.php, we use Garland.
+    // isn't specified in the database or in settings.php, we use Bartik.
     $custom_theme = variable_get('maintenance_theme', variable_get('theme_default', 'bartik'));
   }