Index: feed.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/import/feed.module,v
retrieving revision 1.30
diff -u -r1.30 feed.module
--- feed.module	2 Apr 2004 17:08:19 -0000	1.30
+++ feed.module	6 Apr 2004 15:00:32 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: feed.module,v 1.30 2004/04/02 17:08:19 ber Exp $
+// $Id: feed.module,v 1.28 2003/12/30 09:03:59 unconed Exp $
 
 function feed_system($field) {
   $system["description"] = t("Enables RSS feeds.");
@@ -89,10 +89,10 @@
 
   if ($op == "create") {
     if (user_access("administer news feeds")) {
-      $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "refresh", "link", "expire");
+      $main_fields = array("body" =>  check_output($node->body), "teaser" =>  check_output($node->teaser), "url", "refresh", "link", "expire");
     }
     else {
-      $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
+      $main_fields = array("body" =>  check_output($node->body), "teaser" =>  check_output($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
     }
 
     return array_merge($main_fields, $save_fields);
@@ -100,10 +100,10 @@
 
   if ($op == "update") {
     if (user_access("administer news feeds")) {
-      $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "url", "refresh", "link", "expire");
+      $main_fields = array("body" =>  check_output($node->body), "teaser" =>  check_output($node->teaser), "url", "refresh", "link", "expire");
     }
     else {
-      $main_fields = array("body" => filter($node->body), "teaser" => filter($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
+      $main_fields = array("body" =>  check_output($node->body), "teaser" =>  check_output($node->teaser), "moderate" => "1", "promote" => 0, "comments" => "0", "url", "refresh", "link", "expire");
     }
 
     return array_merge($main_fields, $save_fields);
Index: import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/import/import.module,v
retrieving revision 1.14
diff -u -r1.14 import.module
--- import.module	2 Apr 2004 17:08:19 -0000	1.14
+++ import.module	6 Apr 2004 15:00:33 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: import.module,v 1.14 2004/04/02 17:08:19 ber Exp $
+// $Id: import.module,v 1.12 2003/12/13 04:03:51 drumm Exp $
 function import_perm() {
   return array("access import");
 }
Index: item.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/import/item.module,v
retrieving revision 1.17
diff -u -r1.17 item.module
--- item.module	2 Apr 2004 17:08:19 -0000	1.17
+++ item.module	6 Apr 2004 15:00:33 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: item.module,v 1.17 2004/04/02 17:08:19 ber Exp $
+// $Id: item.module,v 1.15 2003/12/12 08:08:20 drumm Exp $
 
 function item_system($field) {
   $system["description"] = t("Enables items for feeds.");
@@ -178,7 +178,7 @@
   $body = $item["description"] ? $item["description"] : "";
   $created = $item["date"] ? $item["date"] : time();
   $link = $item["link"] ? $item["link"] : $feed->link;
-  $weight = $item["date"] ? 0 : array_shift(db_fetch_array(db_query("SELECT MAX(weight)+1 AS newweight FROM item WHERE parent = '%s'", $feed->nid)));
+  $weight = $item["date"] ? 0 : array_shift(db_fetch_array(db_query("SELECT MAX(weight)+1 AS newweight FROM {item} WHERE parent = '%s'", $feed->nid)));
   if ($item["creator"]) {
     $name = $item["creator"];
   }