? sites/default/modules
? sites/default/settings.php
? themes/engines/phptemplate/.new.phptempla
Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.17
diff -u -p -r1.17 aggregator.install
--- modules/aggregator/aggregator.install	12 Aug 2008 07:00:48 -0000	1.17
+++ modules/aggregator/aggregator.install	13 Oct 2008 05:21:03 -0000
@@ -229,8 +229,8 @@ function aggregator_schema() {
         'description' => t('Author of the feed item.'),
       ),
       'description' => array(
-        'type' => 'text',
-        'not null' => TRUE,
+        'type' => 'blob',
+        'not null' => FALSE,
         'size' => 'big',
         'description' => t('Body of the feed item.'),
       ),
@@ -256,6 +256,11 @@ function aggregator_schema() {
 }
 
 /**
+ * @defgroup updates-6.x-to-7.x Aggregator updates from 6.x to 7.x
+ * @{
+ */
+
+/**
  * Add hash column to aggregator_feed table.
  */
 function aggregator_update_7000() {
@@ -263,3 +268,18 @@ function aggregator_update_7000() {
   db_add_field($ret, 'aggregator_feed', 'hash', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''));
   return $ret;
 }
+
+/**
+ * Remap {aggregator_item}.description as BLOB type.
+ */
+function aggregator_update_7001() {
+  $ret = array();
+  db_change_field($ret, 'aggregator_item', 'description', 'description', array('type' => 'blob', 'not null' => FALSE, 'size' => 'big'));
+
+  return $ret;
+}
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.395
diff -u -p -r1.395 aggregator.module
--- modules/aggregator/aggregator.module	12 Oct 2008 04:30:05 -0000	1.395
+++ modules/aggregator/aggregator.module	13 Oct 2008 05:21:03 -0000
@@ -841,15 +841,14 @@ function aggregator_parse_feed(&$data, $
  */
 function aggregator_save_item($edit) {
   if ($edit['iid'] && $edit['title']) {
-    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['guid'], $edit['timestamp'], $edit['iid']);
+    drupal_write_record('aggregator_item', $edit, 'iid');
   }
   elseif ($edit['iid']) {
     db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']);
     db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']);
   }
   elseif ($edit['title'] && $edit['link']) {
-    db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']);
-    $edit['iid'] = db_last_insert_id('aggregator_item', 'iid');
+    drupal_write_record('aggregator_item', $edit);
     // file the items in the categories indicated by the feed
     $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
     while ($category = db_fetch_object($categories)) {