? .DS_Store
? .project
? 232327-improve-ability-to-handle-orphan-node-types-03.patch
? 410646-secondary-menu-theme-changes.patch
? 736638_getimagesize_0.patch
? aggregator_block_display_test.20100718.patch
? aggregator_block_display_test.20100719.patch
? aggregator_block_link_fix_and_test.20100719.patch
? aggregator_more_links.20100718.patch
? field_ui-882914-20100814.patch
? image_inc-test_image_get_info.20100723-1.patch
? image_inc-test_image_get_info.20100723-2.patch
? image_inc-test_image_get_info.20100723.patch
? phpinfo.php
? profile_user_block-user_load_api_change-20091023.patch
? secondary_menu-410646-1.patch
? taxonomy_description_796692_2.patch
? modules/aggregator/aggregator-atom-130344-31.patch
? modules/aggregator/aggregator-test_sample_rss091_import_and_display.20100723.patch
? modules/aggregator/aggregator.module-20100723-dmans_read_more_fix
? modules/aggregator/aggregator.test-20100723-dman
? modules/aggregator/tests/aggregator_test_atom10.xml
? modules/simpletest/files/image-3.jpg
? modules/simpletest/files/sql-2.sql.gz
? sites/.DS_Store
? sites/devel
? sites/make_site.php
? sites/make_site.sh
? sites/standards
? sites/taxonomy
? sites/template
? sites/test
? sites/all/.DS_Store
? sites/all/libraries
? sites/all/modules
? sites/default/settings.php
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.606
diff -u -p -r1.606 theme.inc
--- includes/theme.inc	22 Aug 2010 12:46:21 -0000	1.606
+++ includes/theme.inc	22 Aug 2010 16:02:24 -0000
@@ -2266,6 +2266,39 @@ function template_preprocess_page(&$vari
   $variables['tabs']              = theme('menu_local_tasks');
   $variables['title']             = drupal_get_title();
 
+  if (isset($variables['main_menu'])) {
+    $variables['primary_nav'] = theme('links__system_main_menu', array(
+      'links' => $variables['main_menu'],
+      'attributes' => array(
+        'class' => array('links', 'main-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Main menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['primary_nav'] = FALSE;
+  }
+  if (isset($variables['secondary_menu'])) {
+    $variables['secondary_nav'] = theme('links__system_secondary_menu', array(
+      'links' => $variables['secondary_menu'],
+      'attributes' => array(
+        'class' => array('links', 'secondary-menu'),
+      ),
+      'heading' => array(
+        'text' => t('Secondary menu'),
+        'level' => 'h2',
+        'class' => array('element-invisible'),
+      )
+    ));
+  }
+  else {
+    $variables['secondary_nav'] = FALSE;
+  }
+
   if ($node = menu_get_object()) {
     $variables['node'] = $node;
   }
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.45
diff -u -p -r1.45 page.tpl.php
--- modules/system/page.tpl.php	8 Aug 2010 19:35:49 -0000	1.45
+++ modules/system/page.tpl.php	22 Aug 2010 16:02:24 -0000
@@ -102,9 +102,10 @@
 
     </div></div> <!-- /.section, /#header -->
 
-    <?php if ($main_menu): ?>
+    <?php if ($primary_nav || $secondary_nav): ?>
       <div id="navigation"><div class="section">
-        <?php print theme('links__system_main_menu', array('links' => $main_menu, 'attributes' => array('id' => 'main-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Main menu'))); ?>
+        <?php if (!empty($primary_nav)): print $primary_nav; endif; ?>
+        <?php if (!empty($secondary_nav)): print $secondary_nav; endif; ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -144,7 +145,6 @@
     </div></div> <!-- /#main, /#main-wrapper -->
 
     <div id="footer"><div class="section">
-      <?php print theme('links__system_secondary_menu', array('links' => $secondary_menu, 'attributes' => array('id' => 'secondary-menu', 'class' => array('links', 'clearfix')), 'heading' => t('Secondary menu'))); ?>
       <?php print render($page['footer']); ?>
     </div></div> <!-- /.section, /#footer -->
 
Index: themes/bartik/templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 page.tpl.php
--- themes/bartik/templates/page.tpl.php	22 Aug 2010 13:57:02 -0000	1.4
+++ themes/bartik/templates/page.tpl.php	22 Aug 2010 16:02:24 -0000
@@ -123,20 +123,10 @@
 
     <?php print render($page['header']); ?>
 
-    <?php if ($main_menu): ?>
+    <?php if ($primary_nav || $secondary_nav): ?>
       <div id="navigation"><div class="section clearfix">
-        <?php print theme('links__system_main_menu', array(
-          'links' => $main_menu,
-          'attributes' => array(
-            'id' => 'main-menu',
-            'class' => array('links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Main menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
+        <?php if (!empty($primary_nav)): print $primary_nav; endif; ?>
+        <?php if (!empty($secondary_nav)): print $secondary_nav; endif; ?>
       </div></div> <!-- /.section, /#navigation -->
     <?php endif; ?>
 
@@ -222,18 +212,6 @@
 
     <?php if ($page['footer'] || $secondary_menu): ?>
       <div id="footer" class="clearfix">
-        <?php print theme('links__system_secondary_menu', array(
-          'links' => $secondary_menu,
-          'attributes' => array(
-            'id' => 'secondary-menu',
-            'class' => array('links', 'clearfix'),
-          ),
-          'heading' => array(
-            'text' => t('Secondary menu'),
-            'level' => 'h2',
-            'class' => array('element-invisible'),
-          ),
-        )); ?>
         <?php print render($page['footer']); ?>
     </div><!-- /#footer -->
     <?php endif; ?>
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	22 Aug 2010 16:02:24 -0000
@@ -59,40 +59,6 @@ function garland_process_html(&$vars) {
  * Override or insert variables into the page template.
  */
 function garland_preprocess_page(&$vars) {
-  $vars['tabs2'] = menu_secondary_local_tasks();
-  if (isset($vars['main_menu'])) {
-    $vars['primary_nav'] = theme('links__system_main_menu', array(
-      'links' => $vars['main_menu'],
-      'attributes' => array(
-        'class' => array('links', 'main-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Main menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['primary_nav'] = FALSE;
-  }
-  if (isset($vars['secondary_menu'])) {
-    $vars['secondary_nav'] = theme('links__system_secondary_menu', array(
-      'links' => $vars['secondary_menu'],
-      'attributes' => array(
-        'class' => array('links', 'secondary-menu'),
-      ),
-      'heading' => array(
-        'text' => t('Secondary menu'),
-        'level' => 'h2',
-        'class' => array('element-invisible'),
-      )
-    ));
-  }
-  else {
-    $vars['secondary_nav'] = FALSE;
-  }
-
   // Prepare header.
   $site_fields = array();
   if (!empty($vars['site_name'])) {