Index: taxonomy_context.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_context/taxonomy_context.module,v
retrieving revision 1.72.2.7.2.1
diff -u -r1.72.2.7.2.1 taxonomy_context.module
--- taxonomy_context.module	11 Apr 2008 09:51:31 -0000	1.72.2.7.2.1
+++ taxonomy_context.module	12 Apr 2008 19:58:36 -0000
@@ -518,8 +518,6 @@
  * Form fields which can be used to set global settings and vocabulary specific settings.
  */
 function _taxonomy_context_vocabulary_settings_fields($vid = NULL) {
-	$suffix = ($vid) ? '_'.$vid : NULL;
-
 	$fields = array();
 	$default_options = $vid ? array(TAXCON_SETTING_USE_DEFAULT => 'Use Default Setting', TAXCON_SETTING_USE_GLOBAL => 'Use Global Setting') : array();
 
@@ -564,6 +562,7 @@
     '#options'        => $default_options + array(TAXCON_MENU_COLLAPSED => t('Collapsed'), TAXCON_MENU_EXPANDED => t('Expanded')),
     '#description'    => t('Do you want items on the menu expanded or collapsed by default?'),
   );
+	/*
 	$fields['taxonomy_context_breadcrumb_includes_vocabulary'.$suffix] = array(
 		'#type'           => 'checkbox',
 		'#title'          => t('Include Vocabulary in Breadcrumbs'),
@@ -571,6 +570,7 @@
 		'#default_value'  => variable_get('taxonomy_context_breadcrumb_includes_vocabulary'.$suffix, ($vid ? TAXCON_SETTING_USE_GLOBAL : TAXCON_BREADCRUMB_INCLUDES_VOCABULARY_DEFAULT)),
 		'#description'    => t('When checked, the Vocabulary name will appear as a link in the breadcrumbs'), 
 	);
+	*/
 	$fields['taxonomy_context_vocabulary_breadcrumb'.$suffix] = array(
 		'#type'           => 'textfield',
 		'#disabled'       => (variable_get('taxonomy_context_breadcrumb_includes_vocabulary'.$suffix, TAXCON_BREADCRUMB_INCLUDES_VOCABULARY_DEFAULT) == TAXCON_BREADCRMB_EXCLUDES_VOCABULARY),
@@ -578,14 +578,15 @@
 		'#description'    => t('You can define a custom breadcrumb (path|title)'),
 		'#default_value'  => variable_get('taxonomy_context_vocabulary_breadcrumb'.$suffix, ($vid ? TAXCON_SETTING_USE_GLOBAL : TAXCON_VOCABULARY_REDIRECT_DEFAULT)),
 	);
-	$fields['taxonomy_context_vocabulary_use_custom_view'.$suffix] = array(
-		'#type'           => 'select',
-		'#title'          => t('Display nodes using'),
-		'#default_value'  => variable_get('taxonomy_context_vocabulary_use_custom_view'.$suffix, ($vid ? TAXCON_SETTING_USE_GLOBAL : TAXCON_VOCABUARLY_USE_CUSTOM_VIEW_DEFAUL)),
-		'#description'    => t('Only use views that provide a page view'),
-		'#options'        => $default_options + _taxonomy_context_views_list(),
-	);
-
+	if (module_exists('views')) {
+		$fields['taxonomy_context_vocabulary_use_custom_view'.$suffix] = array(
+			'#type'           => 'select',
+			'#title'          => t('Display nodes using'),
+			'#default_value'  => variable_get('taxonomy_context_vocabulary_use_custom_view'.$suffix, ($vid ? TAXCON_SETTING_USE_GLOBAL : TAXCON_VOCABUARLY_USE_CUSTOM_VIEW_DEFAUL)),
+			'#description'    => t('Only use views that provide a page view'),
+			'#options'        => $default_options + _taxonomy_context_views_list(),
+		);
+	}
 	return $fields;
 }
 
@@ -655,7 +656,7 @@
   $terms = $tid ? taxonomy_get_children($tid, $vid) : taxonomy_get_tree($vid, 0, -1, 1);
   if ($terms) {
     foreach ($terms as $term) {	
-      $expand   = (1 || taxonomy_context_term_in_active_trail($term->tid) || taxonomy_context_variable_get('menu_expanded', $vid, TAXCON_MENU_EXPANDED_DEFAULT) == TAXCON_MENU_EXPANDED);
+      $expand   = (taxonomy_context_term_in_active_trail($term->tid) || taxonomy_context_variable_get('menu_expanded', $vid, TAXCON_MENU_EXPANDED_DEFAULT) == TAXCON_MENU_EXPANDED);
 			$children = ($expand) ? theme('taxonomy_context_menu_tree', $vid, $term->tid) : '';
 			$tree .= theme('taxonomy_context_menu_item', $term->tid, 'term', $children, (!$children));
     }