Index: contentblocker.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/contentblocker/contentblocker.module,v
retrieving revision 1.12
diff -u -r1.12 contentblocker.module
--- contentblocker.module	29 Aug 2007 22:44:02 -0000	1.12
+++ contentblocker.module	29 Aug 2007 23:03:06 -0000
@@ -1,12 +1,6 @@
 <?php
 // $Id: contentblocker.module,v 1.12 2007/08/29 22:44:02 nedjo Exp $
 
-/**
- * Implementation of hook_init().
- */
-function contentblocker_init() {
-  contentblocker_load_modules();
-}
 
 /**
  * Implementation of hook_help().
@@ -27,6 +21,7 @@
 function contentblocker_menu($may_cache) {
 
   $items = array();
+  contentblocker_load_modules();
   if ($may_cache) {
     // Add a settings menu item.
     $items[] = array(
@@ -38,8 +33,6 @@
       'callback' => 'drupal_get_form',
       'callback arguments' => array('contentblocker_settings_form'),
     );
-  }
-  else {
     $types = contentblocker_get_data();
     if (!empty($types)) {
       $items[] = array(
@@ -68,6 +61,7 @@
       }
     }
   }
+
   return $items;
 }
 
@@ -202,6 +196,8 @@
         }
         break;
     }
+    // Menus need to reflect the current state of the users' registered content blocks.
+    menu_rebuild();
   }
 }