summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2011-04-12 20:42:11 +0200
committerDries Buytaert <dries@buytaert.net>2011-04-12 20:42:11 +0200
commit2d39a11e82f8747abb87e9408b97e09b5b762c7b (patch)
treea7bdc36e7e7f58be08a3642eab2b8d6439b87d33 /modules
parent4b3d9a015420499d9079a0a95c5a0dc4968b4a63 (diff)
downloadbrdo-2d39a11e82f8747abb87e9408b97e09b5b762c7b.tar.gz
brdo-2d39a11e82f8747abb87e9408b97e09b5b762c7b.tar.bz2
- Patch #1023190 by Berdir: wrong merge query in aggregator_save_item().
Diffstat (limited to 'modules')
-rw-r--r--modules/aggregator/aggregator.processor.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 91b440c7c..6eb2c662f 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -162,8 +162,8 @@ function aggregator_save_item($edit) {
$result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $edit['fid']));
foreach ($result as $category) {
db_merge('aggregator_category_item')
- ->key(array('iid' => $edit['iid']))
- ->fields(array(
+ ->key(array(
+ 'iid' => $edit['iid'],
'cid' => $category->cid,
))
->execute();