? .buildpath
? .project
? .settings
? 865970.patch
? ui.borked.patch
? ui.working.patch
? sites/all/modules/crud.inc
? sites/all/modules/devel
? sites/all/modules/extensible.patch
? sites/all/modules/module
? sites/default/files
? sites/default/settings.php
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.441
diff -u -p -r1.441 aggregator.module
--- modules/aggregator/aggregator.module	1 Aug 2010 00:18:20 -0000	1.441
+++ modules/aggregator/aggregator.module	2 Aug 2010 16:59:00 -0000
@@ -547,9 +547,9 @@ function aggregator_save_feed($edit) {
     if (!empty($edit['category'])) {
       foreach ($edit['category'] as $cid => $value) {
         if ($value) {
-          db_merge('aggregator_category_feed')
-            ->key(array('fid' => $edit['fid']))
+          db_insert('aggregator_category_feed')
             ->fields(array(
+              'fid' => $edit['fid'],
               'cid' => $cid,
             ))
             ->execute();