Commit 69b3663d authored by Dave Reid's avatar Dave Reid

Issue #1109410 by David_Rothstein, Dave Reid: Fixed double 'menu' on some menu...

Issue #1109410 by David_Rothstein, Dave Reid: Fixed double 'menu' on some menu bundle lables, and ensure bundle labels are escaped.
parent 70dd6eb6
......@@ -499,7 +499,8 @@ function xmlsitemap_add_form_entity_summary(&$form, $entity, array $entity_info)
$row[] = l($edit_link['title'], $edit_link['href'], $edit_link);
}
else {
$row[] = $bundle_info['label'];
// Bundle labels are assumed to be un-escaped input.
$row[] = check_plain($bundle_info['label']);
}
$row[] = $statuses[$bundle_info['xmlsitemap']['status'] ? 1 : 0];
$row[] = $priorities[number_format($bundle_info['xmlsitemap']['priority'], 1)];
......@@ -511,7 +512,7 @@ function xmlsitemap_add_form_entity_summary(&$form, $entity, array $entity_info)
if ($rows) {
$header = array(
$entity_info['bundle label'],
isset($entity_info['bundle label']) ? $entity_info['bundle label'] : '',
t('Inclusion'),
t('Priority'),
t('Available'),
......
......@@ -35,7 +35,7 @@ function xmlsitemap_menu_entity_info_alter(&$info) {
foreach (menu_get_menus() as $type => $name) {
$info['menu_link']['bundles'][$type] = array(
'label' => t('@menu-name menu', array('@menu-name' => $name)),
'label' => $name,
'admin' => array(
'path' => 'admin/structure/menu/manage/%menu/edit',
'bundle argument' => 4,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment