diff options
| author | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-27 13:20:59 +0200 |
| commit | fb817a29a934a68f194a42c29d3ed11da2da558f (patch) | |
| tree | fdeb88be9d8545ead92c5d63a9d9af7f6a7ccc23 /include/diaspora.php | |
| parent | fabd4f4d2ebd9d1623db7e20d6e4e8f6bd0611ff (diff) | |
| parent | 928e6c7ef78d251429a7d5c1fd4fdb8e6c282d41 (diff) | |
| download | volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.gz volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.tar.bz2 volse-hubzilla-fb817a29a934a68f194a42c29d3ed11da2da558f.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 1b5af42cd..84d28a7ec 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1737,7 +1737,7 @@ function diaspora_retraction($importer,$xml) { contact_remove($contact['id']); } 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'), intval($importer['uid']) ); @@ -1785,7 +1785,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) { } 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), intval($importer['uid']) ); |