--- drupal.breadcrumbs.47.patch	2010-09-21 22:42:12.000000000 -0400
+++ 907690-breadcrumb-55.patch	2010-09-21 22:41:53.000000000 -0400
@@ -772,7 +772,7 @@
  
  /**
 diff --git includes/theme.inc includes/theme.inc
-index 658128c..0175c2d 100644
+index 658128c..994fb36 100644
 --- includes/theme.inc
 +++ includes/theme.inc
 @@ -2257,7 +2257,6 @@ function template_preprocess_page(&$variables) {
@@ -791,15 +791,14 @@
  
    if ($node = menu_get_object()) {
      $variables['node'] = $node;
-@@ -2282,6 +2280,29 @@ function template_preprocess_page(&$variables) {
+@@ -2282,6 +2280,28 @@ function template_preprocess_page(&$variables) {
  }
  
  /**
 + * Process variables for page.tpl.php
 + *
-+ * Perform final addition and modification of variables before passing into
-+ * the template. To customize these variables, simply set them in an earlier
-+ * step already.
++ * Perform final addition of variables before passing them into the template.
++ * To customize these variables, simply set them in an earlier step.
 + *
 + * @see template_preprocess_page()
 + * @see page.tpl.php
@@ -1542,7 +1541,7 @@
    );
  
 diff --git modules/menu/menu.module modules/menu/menu.module
-index 4fed193..2fe910f 100644
+index 4fed193..0eb9897 100644
 --- modules/menu/menu.module
 +++ modules/menu/menu.module
 @@ -95,7 +95,6 @@ function menu_menu() {
@@ -1585,38 +1584,7 @@
      'file' => 'menu.admin.inc',
    );
    return $items;
-@@ -175,29 +170,10 @@ function menu_theme() {
- /**
-  * Implements hook_enable().
-  *
-- * Add a link for each custom menu.
-+ * @todo Fatal error when running tests without this.
-  */
- function menu_enable() {
-   menu_rebuild();
--  $base_link = db_query("SELECT mlid AS plid, menu_name FROM {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc();
--  $base_link['router_path'] = 'admin/structure/menu/manage/%';
--  $base_link['module'] = 'menu';
--  $result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC));
--  foreach ($result as $menu) {
--    // $link is passed by reference to menu_link_save(), so we make a copy of $base_link.
--    $link = $base_link;
--    $link['mlid'] = 0;
--    $link['link_title'] = $menu['title'];
--    $link['link_path'] = 'admin/structure/menu/manage/' . $menu['menu_name'];
--    $menu_link = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND plid = :plid", array(
--      ':path' => $link['link_path'],
--      ':plid' => $link['plid']
--    ))
--    ->fetchField();
--    if (!$menu_link) {
--      menu_link_save($link);
--    }
--  }
-   menu_cache_clear_all();
- }
- 
-@@ -707,7 +683,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
+@@ -707,7 +702,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) {
    $form['menu']['menu_options'] = array(
      '#type' => 'checkboxes',
      '#title' => t('Available menus'),
@@ -1646,27 +1614,6 @@
    }
  
    /**
-diff --git modules/node/content_types.inc modules/node/content_types.inc
-index ce74427..5360485 100644
---- modules/node/content_types.inc
-+++ modules/node/content_types.inc
-@@ -326,6 +326,7 @@ function node_type_form_submit($form, &$form_state) {
-     return;
-   }
- 
-+  form_state_values_clean($form_state);
-   $variables = $form_state['values'];
- 
-   // Remove everything that's been saved already - whatever's left is assumed
-@@ -336,8 +337,6 @@ function node_type_form_submit($form, &$form_state) {
-     }
-   }
- 
--  unset($variables['form_token'], $variables['op'], $variables['submit'], $variables['delete'], $variables['reset'], $variables['form_id'], $variables['form_build_id']);
--
-   // Save or reset persistent variable values.
-   foreach ($variables as $key => $value) {
-     $variable_new = $key . '_' . $type->type;
 diff --git modules/node/node.module modules/node/node.module
 index b708d39..0948b4f 100644
 --- modules/node/node.module
@@ -1883,10 +1830,10 @@
    );
    $items['user/%user/shortcuts'] = array(
 diff --git modules/simpletest/drupal_web_test_case.php modules/simpletest/drupal_web_test_case.php
-index 088b39c..53ecfe0 100644
+index b32406c..a5ff621 100644
 --- modules/simpletest/drupal_web_test_case.php
 +++ modules/simpletest/drupal_web_test_case.php
-@@ -2662,7 +2662,14 @@ class DrupalWebTestCase extends DrupalTestCase {
+@@ -2738,7 +2738,14 @@ class DrupalWebTestCase extends DrupalTestCase {
     *   TRUE on pass, FALSE on fail.
     */
    protected function assertTitle($title, $message = '', $group = 'Other') {
@@ -1902,7 +1849,7 @@
    }
  
    /**
-@@ -2678,7 +2685,14 @@ class DrupalWebTestCase extends DrupalTestCase {
+@@ -2754,7 +2761,14 @@ class DrupalWebTestCase extends DrupalTestCase {
     *   TRUE on pass, FALSE on fail.
     */
    protected function assertNoTitle($title, $message = '', $group = 'Other') {
@@ -1918,11 +1865,11 @@
    }
  
    /**
-@@ -3016,6 +3030,24 @@ class DrupalWebTestCase extends DrupalTestCase {
+@@ -3092,6 +3106,24 @@ class DrupalWebTestCase extends DrupalTestCase {
    }
  
    /**
-+   * Assert the page do not respond with the specified response code.
++   * Assert the page did not return the specified response code.
 +   *
 +   * @param $code
 +   *   Response code. For example 200 is a successful page request. For a list
@@ -2620,17 +2567,17 @@
  
      // Enable access logging.
 diff --git modules/system/system.api.php modules/system/system.api.php
-index d8450db..7dbbe30 100644
+index d8450db..ebb30a8 100644
 --- modules/system/system.api.php
 +++ modules/system/system.api.php
 @@ -1200,6 +1200,53 @@ function hook_menu_local_tasks_alter(&$data, $router_item, $root_path) {
  }
  
  /**
-+ * Alter links in the active trail (breadcrumb) before it is rendered.
++ * Alter links in the active trail before it is rendered as the breadcrumb.
 + *
-+ * This hook is invoked by menu_get_active_breadcrumb() and allows to alter
-+ * the breadcrumb links for the current page, which may be preferred instead
++ * This hook is invoked by menu_get_active_breadcrumb() and allows alteration
++ * of the breadcrumb links for the current page, which may be preferred instead
 + * of setting a custom breadcrumb via drupal_set_breadcrumb().
 + *
 + * Implementations should take into account that menu_get_active_breadcrumb()
@@ -2678,7 +2625,7 @@
   *
   * This hook is invoked by menu_contextual_links(). The system-determined
 diff --git modules/system/system.module modules/system/system.module
-index e9821c6..18d9083 100644
+index 6390ebc..069961a 100644
 --- modules/system/system.module
 +++ modules/system/system.module
 @@ -648,7 +648,6 @@ function system_menu() {