=== modified file 'modules/book/book.module'
--- modules/book/book.module	2007-11-04 14:28:35 +0000
+++ modules/book/book.module	2007-11-20 19:55:40 +0000
@@ -328,6 +328,9 @@ function book_form_alter(&$form, $form_s
  * form element.
  */
 function _book_parent_select($book_link) {
+  if (variable_get('menu_override_parent_selector', FALSE)) {
+    return array();
+  }
   // Offer a message or a drop-down to choose a different parent page.
   $form = array(
     '#type' => 'hidden',

=== modified file 'modules/menu/menu.admin.inc'
--- modules/menu/menu.admin.inc	2007-11-20 13:24:53 +0000
+++ modules/menu/menu.admin.inc	2007-11-20 19:58:34 +0000
@@ -229,6 +229,7 @@ function menu_edit_item(&$form_state, $t
     '#tree' => TRUE,
     '#weight' => -2,
     '#attributes' => array('class' => 'menu-item-form'),
+    '#item' => $item,
   );
   if ($type == 'add' || empty($item)) {
     // This is an add form, initialize the menu link.

=== modified file 'modules/menu/menu.module'
--- modules/menu/menu.module	2007-11-17 14:25:23 +0000
+++ modules/menu/menu.module	2007-11-20 19:59:21 +0000
@@ -202,7 +202,9 @@ function menu_load($menu_name) {
  *   and mlid. The list excludes the given item and its children.
  */
 function menu_parent_options($menus, $item) {
-
+  if (variable_get('menu_override_parent_selector', FALSE)) {
+    return array();
+  }
   // If the item has children, there is an added limit to the depth of valid parents.
   if (isset($item['parent_depth_limit'])) {
     $limit = $item['parent_depth_limit'];
@@ -378,6 +380,7 @@ function menu_form_alter(&$form, $form_s
     foreach (array('mlid', 'module', 'hidden', 'has_children', 'customized', 'options', 'expanded', 'hidden', 'parent_depth_limit') as $key) {
       $form['menu'][$key] = array('#type' => 'value', '#value' => $item[$key]);
     }
+    $form['menu']['#item'] = $item;
 
     $form['menu']['link_title'] = array('#type' => 'textfield',
       '#title' => t('Menu link title'),