Issue backdrop-contrib#42: Prevent broken settings page by any arbitr…

…ary entity.

xmlsitemap.module

@@ -895,11 +895,8 @@ function xmlsitemap_get_link_info($type = NULL, $reset = FALSE) {
     }
     else {
       entity_info_cache_clear();
-      $link_info = array_merge(entity_get_info(), module_invoke_all('xmlsitemap_link_info'));
-      // Remove the entity types we know we don't want to support.
-        // @todo maybe
-      unset($link_info['file']);
-      unset($link_info['comment']);
+      // Only include the entity types we know we want to support.
+      $link_info = module_invoke_all('xmlsitemap_link_info');
       foreach ($link_info as $key => &$info) {
         $info += array(
           'type' => $key,

xmlsitemap.xmlsitemap.inc

@@ -218,14 +218,16 @@ class XMLSitemapIndexWriter extends XMLSitemapWriter {
  * Implements hook_xmlsitemap_link_info().
  */
 function xmlsitemap_xmlsitemap_link_info() {
-  return array(
+  $info = array(
     'frontpage' => array(
       'label' => t('Frontpage'),
       'xmlsitemap' => array(
         'settings callback' => 'xmlsitemap_link_frontpage_settings',
       ),
     ),
   );
+
+  return $info;
 }
 
 /**

xmlsitemap_node/xmlsitemap_node.module

@@ -25,6 +25,19 @@ function xmlsitemap_node_entity_info_alter(array &$entity_info) {
   );
 }
 
+/**
+ * Implements hook_xmlsitemap_link_info().
+ */
+function xmlsitemap_node_xmlsitemap_link_info() {
+  $info = array();
+  $entity_info = entity_get_info();
+  if (isset($entity_info['node'])) {
+    $info['node'] = $entity_info['node'];
+  }
+
+  return $info;
+}
+
 /**
  * Implements hook_cron().
  *

xmlsitemap_taxonomy/xmlsitemap_taxonomy.module

@@ -24,6 +24,20 @@ function xmlsitemap_taxonomy_entity_info_alter(&$entity_info) {
   );
 }
 
+/**
+ * Implements hook_xmlsitemap_link_info().
+ */
+function xmlsitemap_taxonomy_xmlsitemap_link_info() {
+  $info = array();
+  $entity_info = entity_get_info();
+  if (isset($entity_info['taxonomy_term'])) {
+    $info['taxonomy_term'] = $entity_info['taxonomy_term'];
+  }
+
+  return $info;
+}
+
+
 /**
  * Implements hook_xmlsitemap_link_info_alter().
  */
@@ -244,4 +258,3 @@ function xmlsitemap_taxonomy_get_node_count($term) {
   // @todo Use db_rewrite_sql() w/ switch user.
   return db_query_range("SELECT COUNT(ti.nid) FROM {taxonomy_index} ti LEFT JOIN {node n} USING (nid) WHERE ti.tid = :tid AND n.status = 1", 0, 1, array(':tid' => $term->tid))->fetchField();
 }
-

xmlsitemap_user/xmlsitemap_user.module

@@ -24,6 +24,19 @@ function xmlsitemap_user_entity_info_alter(&$entity_info) {
   );
 }
 
+/**
+ * Implements hook_xmlsitemap_link_info().
+ */
+function xmlsitemap_user_xmlsitemap_link_info() {
+  $info = array();
+  $entity_info = entity_get_info();
+  if (isset($entity_info['user'])) {
+    $info['user'] = $entity_info['user'];
+  }
+
+  return $info;
+}
+
 /**
  * Implements hook_cron().
  *