Index: feedapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.module,v
retrieving revision 1.23.2.119.2.63
diff -u -p -r1.23.2.119.2.63 feedapi.module
--- feedapi.module	25 Jun 2009 07:52:12 -0000	1.23.2.119.2.63
+++ feedapi.module	29 Jun 2009 08:18:16 -0000
@@ -840,20 +840,6 @@ function feedapi_create_node($param, $ur
 }
 
 /**
- * Load node by URL.
- * @param $args
- *  Currently only supported $args['url] - URL string.
- * @return
- *  Node object if successful, FALSE if not.
- */
-function feedapi_load_node($args) {
-  if ($nid = db_result(db_query("SELECT nid FROM {feedapi} WHERE url = '%s'", $args['url']))) {
-    return node_load($nid);
-  }
-  return FALSE;
-}
-
-/**
  * Refresh a feed node (= run enabled processors on it).
  * @param $node
  *  A node object with a $node->feed object.
Index: feedapi_node/feedapi_node.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.module,v
retrieving revision 1.1.2.18.2.34
diff -u -p -r1.1.2.18.2.34 feedapi_node.module
--- feedapi_node/feedapi_node.module	19 Jun 2009 15:59:48 -0000	1.1.2.18.2.34
+++ feedapi_node/feedapi_node.module	29 Jun 2009 08:18:16 -0000
@@ -192,8 +192,6 @@ function feedapi_node_feedapi_settings_f
  */
 function feedapi_node_feedapi_item($op) {
   switch ($op) {
-    case 'type':
-      return array("XML feed");
     case 'save':
     case 'expire':
     case 'update':
Index: parser_common_syndication/parser_common_syndication.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/parser_common_syndication/parser_common_syndication.module,v
retrieving revision 1.6.2.23.2.42
diff -u -p -r1.6.2.23.2.42 parser_common_syndication.module
--- parser_common_syndication/parser_common_syndication.module	5 Jun 2009 13:49:43 -0000	1.6.2.23.2.42
+++ parser_common_syndication/parser_common_syndication.module	29 Jun 2009 08:18:16 -0000
@@ -25,8 +25,6 @@ function parser_common_syndication_help(
 function parser_common_syndication_feedapi_feed($op) {
   $args = func_get_args();
   switch ($op) {
-    case 'type':
-      return array("XML feed");
     case 'compatible':
       if (!function_exists('simplexml_load_string')) {
         return FALSE;
@@ -35,7 +33,7 @@ function parser_common_syndication_feeda
       $settings = isset($args[2]) ? $args[2] : array();
       $downloaded_string = _parser_common_syndication_download($url, $settings);
       if (is_object($downloaded_string)) {
-        return array_shift(parser_common_syndication_feedapi_feed('type'));
+        return "XML feed";
       }
       if (!defined('LIBXML_VERSION') || (version_compare(phpversion(), '5.1.0', '<'))) {
         @ $xml = simplexml_load_string($downloaded_string, NULL);
@@ -50,8 +48,7 @@ function parser_common_syndication_feeda
         if (is_object($parsed_feed) && empty($parsed_feed->from_cache)) {
           _parser_common_syndication_cache_set($url, $parsed_feed);
         }
-        // We don't have to choose between the types, because this module is only able to parse one.
-        return array_shift(parser_common_syndication_feedapi_feed('type'));
+        return "XML feed";
       }
       return FALSE;
     case 'parse':
Index: parser_simplepie/parser_simplepie.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/parser_simplepie/parser_simplepie.module,v
retrieving revision 1.6.2.20.2.15
diff -u -p -r1.6.2.20.2.15 parser_simplepie.module
--- parser_simplepie/parser_simplepie.module	17 Jun 2009 15:04:23 -0000	1.6.2.20.2.15
+++ parser_simplepie/parser_simplepie.module	29 Jun 2009 08:18:16 -0000
@@ -45,8 +45,6 @@ function parser_simplepie_feedapi_feed($
   $valid_ip_regex = "^([1-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])){3}^";
   $op = (gethostbyname($url_parts['host']) !== $url_parts['host'] || preg_match($valid_ip_regex, $url_parts['host']) > 0) ? $op : FALSE;
   switch ($op) {
-    case 'type':
-      return array("XML feed");
     case 'compatible':
       // Stop gap for simplefeed.inc version <= 1.1
       return "XML feed";
@@ -56,7 +54,7 @@ function parser_simplepie_feedapi_feed($
       if ($parser->error) {
         return FALSE;
       }
-      return array_shift(parser_simplepie_feedapi_feed('type'));
+      return "XML feed";
     case 'parse':
       $feed = is_object($args[1]) ? $args[1] : FALSE;
       return _parser_simplepie_feedapi_parse($feed, $settings);
@@ -64,7 +62,6 @@ function parser_simplepie_feedapi_feed($
   return FALSE;
 }
 
-
 /**
  * Implementation of hook_feedapi_settings_form().
  * If a module provides parsers and processors it MUST evaluate the $type variable