Index: custom_breadcrumbs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/custom_breadcrumbs/custom_breadcrumbs.module,v
retrieving revision 1.6.2.5.2.12
diff -u -r1.6.2.5.2.12 custom_breadcrumbs.module
--- custom_breadcrumbs.module	12 Jun 2009 15:15:47 -0000	1.6.2.5.2.12
+++ custom_breadcrumbs.module	20 Jun 2009 02:58:54 -0000
@@ -127,8 +127,10 @@
     global $language;
     $languages = array('language' => $language->language, 'all' => '');
     $breadcrumbs = custom_breadcrumbs_load_breadcrumbs('custom_breadcrumbs', NULL, array('node_type' => $node->type), $languages);
-    if ($breadcrumb = custom_breadcrumbs_select_breadcrumb($breadcrumbs, $node)) {
-      custom_breadcrumbs_set_breadcrumb($breadcrumb, $node);
+    if (!empty($breadcrumbs)) {
+      if ($breadcrumb = custom_breadcrumbs_select_breadcrumb($breadcrumbs, $node)) {
+        custom_breadcrumbs_set_breadcrumb($breadcrumb, $node);
+      }
     }
   }
 }
@@ -161,8 +163,7 @@
       $output = '<p>'. t('Custom breadcrumbs have been created for this %type page. Use the !link to add additional breadcrumbs. Or follow the links in the table below to edit or delete existing custom breadcrumbs.', array('%type' => $form['type']['#value'], '!link' => l('Custom Breadcrumbs Administration Page', 'admin/build/custom_breadcrumbs'))) .'</p>';
     }
     // Show a table of custom breadcrumbs with links to the edit form.
-    require_once(drupal_get_path('module', 'custom_breadcrumbs') .'/custom_breadcrumbs.admin.inc');
-
+    module_load_include('inc', 'custom_breadcrumbs', 'custom_breadcrumbs.admin');
     $output .= custom_breadcrumbs_simple_breadcrumb_table($breadcrumbs);
     $form['custom_breadcrumbs'] = array(
       '#type'           => 'fieldset',
@@ -321,6 +322,7 @@
     switch ($identifier) {
       case '<pathauto>':
         if (module_exists('pathauto')) {
+          module_load_include('inc', 'pathauto', 'pathauto');
           $crumb = l(t($title), pathauto_cleanstring($path, FALSE), $options);
         }
         break;
Index: custom_breadcrumbs_views/custom_breadcrumbs_views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/custom_breadcrumbs/custom_breadcrumbs_views/Attic/custom_breadcrumbs_views.module,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 custom_breadcrumbs_views.module
--- custom_breadcrumbs_views/custom_breadcrumbs_views.module	12 Jun 2009 15:15:47 -0000	1.1.2.6
+++ custom_breadcrumbs_views/custom_breadcrumbs_views.module	20 Jun 2009 02:58:54 -0000
@@ -5,7 +5,7 @@
  * Provide custom breadcrumbs for views pages.
 	*/
 
-require_once(drupal_get_path('module', 'custom_breadcrumbs') .'/custom_breadcrumbs.admin.inc');
+module_load_include('inc', 'custom_breadcrumbs', 'custom_breadcrumbs.admin');
 
 /**
  * Implementation of hook_cb_breadcrumb_info().
@@ -58,9 +58,11 @@
     if ($display->display_plugin != 'page' || $display->handler->view->is_attachment) continue;
     $name = $display->display_options['path'];
     $breadcrumbs = custom_breadcrumbs_load_breadcrumbs('custom_breadcrumbs_views', NULL, array('views_path' => $name), $languages);
-    if ($breadcrumb = custom_breadcrumbs_select_breadcrumb($breadcrumbs, $view)) {
-      custom_breadcrumbs_set_breadcrumb($breadcrumb, $view);
-      return;
+    if (!empty($breadcrumbs)) {
+      if ($breadcrumb = custom_breadcrumbs_select_breadcrumb($breadcrumbs, $view)) {
+        custom_breadcrumbs_set_breadcrumb($breadcrumb, $view);
+        return;
+      }
     }
   }
 }