Index: modules/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu.module,v
retrieving revision 1.50
diff -u -p -r1.50 menu.module
--- modules/menu.module	4 Dec 2005 08:00:13 -0000	1.50
+++ modules/menu.module	4 Dec 2005 12:41:46 -0000
@@ -143,7 +143,16 @@ function menu_configure() {
 
   $form['settings_authoring']['intro'] = array(
     '#type' => 'item',
-    '#value' => t('On each post authoring form there is a menu settings pane. This setting allows you to limit what is displayed in the parent item drop-down menu of that pane. This can be used to force new menu items to be created in the primary links menu or to hide admin menu items.'),
+    '#value' => t('On each post authoring form there is a menu settings pane. The options here allow you to toggle the display of that pane, and to limit what is displayed in the pane\'s parent item drop-down menu. An example use for this could be to force new menu items to be created in the primary links menu, or to hide admin menu items.'),
+  );
+  
+  $display_options = array(1 => t('Enabled'), 0 => t('Disabled'));
+  $form['settings_authoring']['menu_post_authoring'] = array(
+    '#type' => 'radios',
+    '#title' => t('Display menu settings pane'),
+    '#default_value' =>  variable_get('menu_post_authoring', 0),
+    '#options' => $display_options,
+    '#description' => t('Toggle display of the menu settings pane on all post authoring forms. When this is disabled, menu items can only be managed through the menu administration page.'),
   );
 
   $authoring_options = array(0 => t('Show all menus'));
@@ -189,8 +198,7 @@ function menu_block($op = 'list', $delta
  * Implementation of hook_nodeapi().
  */
 function menu_nodeapi(&$node, $op) {
-
-  if (user_access('administer menu')) {
+  if (user_access('administer menu') && variable_get('menu_post_authoring', 0)) {
     switch ($op) {
       case 'form':
         $edit = isset($_POST['edit']) ? $_POST['edit'] : '';
