Index: menutrails.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/menutrails/menutrails.module,v
retrieving revision 1.4.2.10
diff -u -p -r1.4.2.10 menutrails.module
--- menutrails.module	4 Dec 2008 02:12:28 -0000	1.4.2.10
+++ menutrails.module	2 Feb 2009 01:25:01 -0000
@@ -86,12 +86,10 @@ function menutrails_nodeapi(&$node, $op,
  */
 function menutrails_get_breadcrumbs() {
   $item = menu_get_item();
+  // Give first priority to the selected menu.
+  $menu = variable_get('menutrails_menu', FALSE);
   if (!$menu) {
-    // Give first priority to the selected menu.
-    $menu = variable_get('menutrails_menu', FALSE);
-    if (!$menu) {
-      $menu = db_result(db_query("SELECT menu_name FROM {menu_links} WHERE link_path = '%s' AND module = 'menu'", $item['href']));
-    }
+    $menu = db_result(db_query("SELECT menu_name FROM {menu_links} WHERE link_path = '%s' AND module = 'menu'", $item['href']));
   }
   $tree = menu_tree_page_data($menu);
   $crumbs = array(l(t('Home'), '<front>'));
@@ -277,7 +275,7 @@ function menutrails_menutrails_settings(
       foreach ($terms as $term) {
         $form[$vocab->vid]['menutrails_terms'][$term->tid] = array('#type' => 'select',
           '#title' => t('Parent item for') ." $term->name",
-          '#default_value' => $term_trails[$term->tid],
+          '#default_value' => isset($term_trails[$term->tid]) ? $term_trails[$term->tid] : NULL,
           '#options' => $options,
         );
       }
@@ -319,7 +317,7 @@ function menutrails_menutrails_settings(
       $form['menutrails_og']['menutrails_og_node'][$node->nid] = array(
         '#type' => 'select',
         '#title' => 'Group '. $node->title,
-        '#default_value' => $og_trails[$node->nid],
+        '#default_value' => isset($og_trails[$node->nid]) ? $og_trails[$node->nid] : NULL,
         '#options' => $options,
       );
     }
@@ -344,7 +342,7 @@ function menutrails_token_values($type, 
       array_pop($trail_raw);
     }
     $trail = array();
-    if (is_array($trail_raw)) {
+    if (!empty($trail_raw)) {
       foreach ($trail_raw as $title) {
         $trail[] = check_plain($title);
       }