mexon/friendica
1
0
Fork 0
Code Pull requests Activity

block filed items from deletion

Browse source
This commit is contained in:
friendica 2012-03-24 04:16:27 -07:00
parent 8c4fbc3b4d
commit 3aacc119a1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/diaspora.php
View file

@ -1737,7 +1737,7 @@ function diaspora_retraction($importer,$xml) {
contact_remove($contact['id']); contact_remove($contact['id']);
} }
elseif($type === 'Post') { elseif($type === 'Post') {
$r = q("select * from item where guid = '%s' and uid = %d limit 1", $r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
dbesc('guid'), dbesc('guid'),
intval($importer['uid']) intval($importer['uid'])
); );
@ -1785,7 +1785,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
} }
if($type === 'StatusMessage') { if($type === 'StatusMessage') {
$r = q("select * from item where guid = '%s' and uid = %d limit 1", $r = q("select * from item where guid = '%s' and uid = %d and not file like '%%[%%' limit 1",
dbesc($guid), dbesc($guid),
intval($importer['uid']) intval($importer['uid'])
); );

4
include/items.php
View file

@ -1437,7 +1437,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
} }
if($deleted && is_array($contact)) { if($deleted && is_array($contact)) {
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id` $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join `contact` on `item`.`contact-id` = `contact`.`id`
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1", WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
dbesc($uri), dbesc($uri),
intval($importer['uid']), intval($importer['uid']),
intval($contact['id']) intval($contact['id'])
@ -2038,7 +2038,7 @@ function local_delivery($importer,$data) {
if($deleted) { if($deleted) {
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id` $r = q("SELECT `item`.*, `contact`.`self` FROM `item` left join contact on `item`.`contact-id` = `contact`.`id`
WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d LIMIT 1", WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
dbesc($uri), dbesc($uri),
intval($importer['importer_uid']), intval($importer['importer_uid']),
intval($importer['id']) intval($importer['id'])