From dac6a2be3df7c4cd43cf454fb708a80c83c85993 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 26 Apr 2009 19:59:31 +0000
Subject: #423886 by Berdir: Fix fatal error when submitting aggregator block.

---
 modules/aggregator/aggregator.module | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 26f2ad12a..6f7174e10 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -332,9 +332,9 @@ function aggregator_block_configure($delta = '') {
 function aggregator_block_save($delta = '', $edit = array()) {
   list($type, $id) = explode('-', $delta);
   if ($type == 'category') {
-    db_merge('aggregator_category')
-      ->key(array('cid' => $id))
+    db_update('aggregator_category')
       ->fields(array('block' => $edit['block']))
+      ->condition('cid', $id)
       ->execute();
   }
 }
-- 
cgit v1.2.3