--- sitemenu-5.x-1.x-dev/sitemenu.module	2007-05-07 05:42:44.000000000 +0200
+++ sitemenu-5.x-1.x-dev.optShowVocabTitlesPage/sitemenu.module	2007-05-19 22:12:36.000000000 +0200
@@ -18,7 +18,7 @@ define('SITEMENU_NODE_COUNT',          '
 define('SITEMENU_AUTHOR_AND_COMMENTS', 'sitemenu_author_and_comments');
 define('SITEMENU_MAX_ROWS',            'sitemenu_max_rows');
 define('SITEMENU_FOOTER',              'sitemenu_footer');
-define('SITEMENU_BLOCK_VOCAB_TITLES',  'sitemenu_block_vocab_titles');
+define('SITEMENU_SHOW_VOCAB_TITLES',   'sitemenu_show_vocab_titles');
 
 function sitemenu_help($section) {
   switch ($section) {
@@ -127,10 +127,10 @@ function sitemenu_settings() {
     '#default_value' => variable_get(SITEMENU_AUTHOR_AND_COMMENTS, 1),
     );
 
-  $form[SITEMENU_BLOCK_VOCAB_TITLES] = array(
+  $form[SITEMENU_SHOW_VOCAB_TITLES] = array(
     '#type' => 'checkbox',
-    '#title' => t('Show vocabulary title in sitemenu block'),
-    '#default_value' => variable_get(SITEMENU_BLOCK_VOCAB_TITLES, 1),
+    '#title' => t('Show vocabulary titles'),
+    '#default_value' => variable_get(SITEMENU_SHOW_VOCAB_TITLES, 1),
     );
 
   $form[SITEMENU_MAX_ROWS] = array(
@@ -295,11 +295,11 @@ function _sitemenu_print_boxes($boxes, $
     $output .= variable_get(SITEMENU_DESCRIPTION, '');
   }
   foreach ($boxes as $box) {
+    $subject = variable_get(SITEMENU_SHOW_VOCAB_TITLES, 1) ? $box['subject'] : '';
     if ($mode == 'page') {
-      $output .= theme('box', $box['subject'], $box['content']);
+      $output .= theme('box', $subject, $box['content']);
     }
     else {
-      $subject = variable_get(SITEMENU_BLOCK_VOCAB_TITLES, 1) ? $box['subject'] : '';
       $output .= theme('sitemenu_box', $subject, $box['content']);
     }
   }