Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.174
diff -u -p -r1.174 menu.inc
--- includes/menu.inc	1 Jun 2007 09:40:40 -0000	1.174
+++ includes/menu.inc	1 Jun 2007 14:20:19 -0000
@@ -1097,8 +1097,11 @@ function menu_get_active_breadcrumb() {
     }
     $end = end($active_trail);
 
-    // Don't show a link to the current page in the breadcrumb trail.
-    if ($item['href'] == $end['href'] || ($item['type'] == MENU_DEFAULT_LOCAL_TASK && $end['href'] != '<front>')) {
+    // Only show a link to the current page in the breadcrumb trail when setting is active.
+    if (theme_get_setting('toggle_current_breadcrumb') && ((bool)($item['type'] & MENU_VISIBLE_IN_BREADCRUMB) || (bool)($item['type'] & MENU_LOCAL_TASK))) {
+      $breadcrumb[sizeof($breadcrumb)-1] = '<span>' . $end['title'] . '</span>';
+    }
+    elseif ($item['href'] == $end['href'] || ($item['type'] == MENU_DEFAULT_LOCAL_TASK && $end['href'] != '<front>')) {
       array_pop($breadcrumb);
     }
   }
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.357
diff -u -p -r1.357 theme.inc
--- includes/theme.inc	31 May 2007 12:14:04 -0000	1.357
+++ includes/theme.inc	1 Jun 2007 14:20:20 -0000
@@ -609,6 +609,7 @@ function theme_get_settings($key = NULL)
     'toggle_mission'                =>  1,
     'toggle_node_user_picture'      =>  0,
     'toggle_comment_user_picture'   =>  0,
+    'toggle_current_breadcrumb'     =>  0,
   );
 
   if (module_exists('node')) {
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.487
diff -u -p -r1.487 system.module
--- modules/system/system.module	1 Jun 2007 09:37:16 -0000	1.487
+++ modules/system/system.module	1 Jun 2007 14:20:22 -0000
@@ -1049,7 +1049,8 @@ function system_theme_default() {
       'name',
       'node_user_picture',
       'search',
-      'slogan'
+      'slogan',
+      'current_breadcrumb',
     ),
     'stylesheet' => 'style.css',
     'screenshot' => 'screenshot.png',
@@ -2223,7 +2224,8 @@ function system_theme_settings($key = ''
     'node_user_picture'    => t('User pictures in posts'),
     'comment_user_picture' => t('User pictures in comments'),
     'search'               => t('Search box'),
-    'favicon'              => t('Shortcut icon')
+    'favicon'              => t('Shortcut icon'),
+    'current_breadcrumb'   => t('Current page displays in breadcrumb'),
   );
 
   // Some features are not always available