#68807 by jvandyk, a few menu.module cleanups.

2 files changed, 6 insertions, 8 deletions

diff --git a/modules/menu.module b/modules/menu.module
index d6e029580..f7c657f84 100644
--- a/modules/menu.module
+++ b/modules/menu.module
@@ -248,7 +248,6 @@ function menu_form_alter($form_id, &$form) {
  * Menu callback; presents menu configuration options.
  */
 function menu_configure() {
-  $menu = menu_get_menu();
   $root_menus = menu_get_root_menus();
 
   $primary_options = $root_menus;
@@ -279,11 +278,11 @@ function menu_configure() {
   );
 
   $form['settings_authoring'] = array('#type' => 'fieldset',
-    '#title' => t('Post authoring form settings'),
+    '#title' => t('Content authoring form settings'),
   );
 
   $form['settings_authoring']['intro'] = array('#type' => 'item',
-    '#value' => t('The menu module allows on-the-fly creation of menu links in the post authoring forms. The following option limits the menus in which a new link may be added. For e.g. 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('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option limits the menus in which a new link may be added. E.g., this can be used to force new menu items to be created in the primary links menu or to hide admin menu items.'),
   );
 
   $authoring_options = $root_menus;
@@ -293,7 +292,7 @@ function menu_configure() {
     '#title' => t('Restrict parent items to'),
     '#default_value' => variable_get('menu_parent_items', 0),
     '#options' => $authoring_options,
-    '#description' => t('Choose the menu to be made available in the post authoring form. Only this menu item and its children will be shown.'),
+    '#description' => t('Choose the menu to be made available in the content authoring form. Only this menu item and its children will be shown.'),
    );
 
   return system_settings_form('menu_configure', $form);
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index d6e029580..f7c657f84 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -248,7 +248,6 @@ function menu_form_alter($form_id, &$form) {
  * Menu callback; presents menu configuration options.
  */
 function menu_configure() {
-  $menu = menu_get_menu();
   $root_menus = menu_get_root_menus();
 
   $primary_options = $root_menus;
@@ -279,11 +278,11 @@ function menu_configure() {
   );
 
   $form['settings_authoring'] = array('#type' => 'fieldset',
-    '#title' => t('Post authoring form settings'),
+    '#title' => t('Content authoring form settings'),
   );
 
   $form['settings_authoring']['intro'] = array('#type' => 'item',
-    '#value' => t('The menu module allows on-the-fly creation of menu links in the post authoring forms. The following option limits the menus in which a new link may be added. For e.g. 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('The menu module allows on-the-fly creation of menu links in the content authoring forms. The following option limits the menus in which a new link may be added. E.g., this can be used to force new menu items to be created in the primary links menu or to hide admin menu items.'),
   );
 
   $authoring_options = $root_menus;
@@ -293,7 +292,7 @@ function menu_configure() {
     '#title' => t('Restrict parent items to'),
     '#default_value' => variable_get('menu_parent_items', 0),
     '#options' => $authoring_options,
-    '#description' => t('Choose the menu to be made available in the post authoring form. Only this menu item and its children will be shown.'),
+    '#description' => t('Choose the menu to be made available in the content authoring form. Only this menu item and its children will be shown.'),
    );
 
   return system_settings_form('menu_configure', $form);