commit 24e8647f665775a627a437dc99517338bff17bd1
Author: James Wilson <jrwilson3@gmail.com>
Date:   Fri Jul 5 12:44:52 2013 -0400

    Issue #693302: fix some errors introduced in #110

diff --git a/plugins/content_types/menu_tree/menu_tree.inc b/plugins/content_types/menu_tree/menu_tree.inc
index 665e6f7..4be883a 100644
--- a/plugins/content_types/menu_tree/menu_tree.inc
+++ b/plugins/content_types/menu_tree/menu_tree.inc
@@ -84,7 +84,6 @@ function menu_block_menu_tree_content_type_render($subtype, $conf, $args, $conte
   $conf['delta'] = 'ctools-' . $conf['menu_name'] . '-' . $delta;
 
   $tree = menu_tree_build($conf);
-
   $block              = new stdClass();
   $block->subtype     = $conf['menu_name'];
   $block->title       = $tree['subject'];
@@ -111,13 +110,13 @@ function menu_block_menu_tree_content_type_edit_form($form, &$form_state) {
 
   // Set the options to a simple list of menu links for the configured menu.
   $menus = menu_block_get_all_menus();
-  $form['parent']['#options'] = menu_parent_options(array($conf['menu_name'] => $menus[$conf['menu_name']]), array('mlid' => 0));
+  $form['parent_mlid']['#options'] = menu_parent_options(array($conf['menu_name'] => $menus[$conf['menu_name']]), array('mlid' => 0));
   // Hide the Parent item option for the special "active" menu.
   if ($conf['menu_name'] == MENU_TREE__CURRENT_PAGE_MENU) {
-    $form['parent']['#type'] = 'hidden';
+    $form['parent_mlid']['#type'] = 'hidden';
   }
   // Remove CSS class hooks for jQuery script on parent select.
-  unset($form['parent']['#attributes']);
+  unset($form['parent_mlid']['#attributes']);
 
   return $form;
 }
diff --git a/plugins/export_ui/menu_block.inc b/plugins/export_ui/menu_block.inc
index 3ad0ef7..1062e24 100644
--- a/plugins/export_ui/menu_block.inc
+++ b/plugins/export_ui/menu_block.inc
@@ -160,9 +160,9 @@ function menu_block_export_ui_form(&$form, &$form_state) {
 
   $form['sort'] = array(
     '#type' => 'checkbox',
-    '#title' => t('<strong>Sort</strong> menu tree by the active menu item’s trail.'),
+    '#title' => t('<strong>Sort</strong> menu tree by the active menu item’s trail.'),
     '#default_value' => $form_state['item']->sort,
-    '#description' => t('Sort each item in the active trail to the top of its level. When used on a deep or wide menu tree, the active menu item’s children will be easier to see when the page is reloaded.'),
+    '#description' => t('Sort each item in the active trail to the top of its level. When used on a deep or wide menu tree, the active menu item’s children will be easier to see when the page is reloaded.'),
   );
 
   $form['parent_mlid'] = array(