? .DS_Store
? 410646-secondary-menu-theme-changes-112.patch
? 410646-secondary-menu-theme-changes-119.patch
? 786620-forum-add-d7_0.patch
? 838638.drupal.admin-table-ops-extendable-taxo-vocab.patch
? 846542-8.drupal.bartik-fluid-width.patch
? 890708-14.drupal.user-menu-block-install.patch
? 890708-8.drupal.user-menu-block-install.patch
? 890708.drupal.user-menu-block-install.patch
? drupal-846542.patch
? modules/.DS_Store
? profiles/.DS_Store
? sites/.DS_Store
? sites/all/.DS_Store
? sites/all/modules/.DS_Store
? sites/all/modules/admin_menu
? sites/all/modules/devel
? sites/all/modules/entity
? sites/default/files
? sites/default/settings.php
? themes/.DS_Store
? themes/bartik/.DS_Store
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.406
diff -u -p -r1.406 menu.inc
--- includes/menu.inc	22 Aug 2010 14:57:44 -0000	1.406
+++ includes/menu.inc	23 Aug 2010 12:41:33 -0000
@@ -1635,11 +1635,11 @@ function menu_secondary_menu() {
 
   // If the secondary menu source is set as the primary menu, we display the
   // second level of the primary menu.
-  if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) {
+  if (variable_get('menu_secondary_links_source', 'main-menu') == variable_get('menu_main_links_source', 'main-menu')) {
     return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1);
   }
   else {
-    return menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0);
+    return menu_navigation_links(variable_get('menu_secondary_links_source', 'main-menu'), 0);
   }
 }
 
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.83
diff -u -p -r1.83 menu.admin.inc
--- modules/menu/menu.admin.inc	1 Aug 2010 23:33:18 -0000	1.83
+++ modules/menu/menu.admin.inc	23 Aug 2010 12:41:34 -0000
@@ -694,7 +694,7 @@ function menu_configure() {
   $form['menu_secondary_links_source'] = array(
     '#type' => 'select',
     '#title' => t('Source for the Secondary links'),
-    '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'),
+    '#default_value' => variable_get('menu_secondary_links_source', 'main-menu'),
     '#options' => $secondary_options,
     '#tree' => FALSE,
     '#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
Index: profiles/standard/standard.install
===================================================================
RCS file: /cvs/drupal/drupal/profiles/standard/standard.install,v
retrieving revision 1.22
diff -u -p -r1.22 standard.install
--- profiles/standard/standard.install	9 Aug 2010 19:55:57 -0000	1.22
+++ profiles/standard/standard.install	23 Aug 2010 12:41:34 -0000
@@ -127,6 +127,16 @@ function standard_install() {
     ),
     array(
       'module' => 'system',
+      'delta' => 'user-menu',
+      'theme' => $default_theme,
+      'status' => 1,
+      'weight' => 1,
+      'region' => 'header',
+      'pages' => '',
+      'cache' => -1,
+    ),
+    array(
+      'module' => 'system',
       'delta' => 'powered-by',
       'theme' => $default_theme,
       'status' => 1,
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.41
diff -u -p -r1.41 template.php
--- themes/garland/template.php	30 Jul 2010 02:47:28 -0000	1.41
+++ themes/garland/template.php	23 Aug 2010 12:41:34 -0000
@@ -119,6 +119,14 @@ function garland_preprocess_page(&$vars)
 function garland_preprocess_block(&$vars) {
   $vars['title_attributes_array']['class'][] = 'title';
   $vars['classes_array'][] = 'clearfix';
+
+  // In the header region, visually hide the title of any menu block, the
+  // user login block, but leave it accessible.
+  if ($vars['block']->region == 'header') {
+    if ($vars['block']->module == 'user' && $vars['block']->delta == 'login' || in_array('block-menu', $vars['classes_array'])) {
+      $vars['title_attributes_array']['class'][] = 'element-invisible';
+    }
+  }
 }
 
 /**