aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-10-26 12:15:38 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2011-10-26 12:15:38 +0200
commitdc212de9606422be6e912a0bb7f3569192942938 (patch)
tree5a253e3b57d14751214513a029d84699f5ad5b21 /include/items.php
parentbed0043b30c219a08aa0b352923299ea153d515c (diff)
parent6d6136cdb5a2149037c3cf315b3fa81a72bd7d55 (diff)
downloadvolse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.gz
volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.tar.bz2
volse-hubzilla-dc212de9606422be6e912a0bb7f3569192942938.zip
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 4e7674a2e..1b4b52491 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1264,7 +1264,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
}
if($deleted && is_array($contact)) {
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.id`
- WHERE `uri` = '%s' AND `uid` = %d AND `contact-id` = %d LIMIT 1",
+ WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1",
dbesc($uri),
intval($importer['uid']),
intval($contact['id'])