--- menu_breadcrumb.module	Thu Feb 21 07:56:34 2008
+++ menu_breadcrumbNew.module	Tue Mar 03 11:26:11 2009
@@ -80,23 +80,6 @@ function menu_breadcrumb_init() {
     $use_menu = $menu_link['menu_name'];
     menu_set_active_menu_name($use_menu);
   }
-
-  $breadcrumb = drupal_get_breadcrumb();
-  
-  if (variable_get('menu_breadcrumb_append_node_title', 0) == 1) {
-    if (variable_get('menu_breadcrumb_append_node_url', 0) == 1) {
-      $breadcrumb[] = l(drupal_get_title(), $_GET['q']);
-    }
-    else {
-      $breadcrumb[] = drupal_get_title();
-    }
-  }
-    
-  if (count($breadcrumb) == 1 && variable_get('menu_breadcrumb_hide_on_single_item', 0)) {
-    $breadcrumb = array();
-  }
-    
-  drupal_set_breadcrumb($breadcrumb);
 }
 
 /**
@@ -135,4 +118,25 @@ function menu_breadcrumb_admin_settings_
   );
 
   return system_settings_form($form);
+}
+
+function menu_breadcrumb_preprocess(&$vars, $hook) {
+  if ($hook == 'page') {
+    $breadcrumb = drupal_get_breadcrumb();
+    
+    if (variable_get('menu_breadcrumb_append_node_title', 0) == 1) {
+      if (variable_get('menu_breadcrumb_append_node_url', 0) == 1) {
+        $breadcrumb[] = l(drupal_get_title(), $_GET['q'], array('html' => true));
+      }
+      else {
+        $breadcrumb[] = drupal_get_title();
+      }
+    }
+      
+    if (count($breadcrumb) == 1 && variable_get('menu_breadcrumb_hide_on_single_item', 0)) {
+      $breadcrumb = array();
+    }
+      
+    $vars['breadcrumb'] = theme('breadcrumb', $breadcrumb);
+  } 
 }
