strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #3128 from annando/bugfix-no-self-destroy

Browse source 
Bugfix: Sometimes the self contact seems to destroy itself
This commit is contained in:
Tobias Diekershoff 2017-01-30 09:11:10 +01:00 committed by GitHub
commit dd36b2bded
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/Contact.php
View file

@ -60,14 +60,16 @@ function user_remove($uid) {
function contact_remove($id) { function contact_remove($id) {
$r = q("select uid from contact where id = %d limit 1", // We want just to make sure that we don't delete our "self" contact
$r = q("SELECT `uid` FROM `contact` WHERE `id` = %d AND NOT `self` LIMIT 1",
intval($id) intval($id)
); );
if((! dbm::is_result($r)) || (! intval($r[0]['uid']))) if (!dbm::is_result($r) || !intval($r[0]['uid'])) {
return; return;
}
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts'); $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
if($archive) { if ($archive) {
q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d", q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
intval($id) intval($id)
); );
@ -571,7 +573,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
} }
if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != "")) if ((count($contact) > 1) AND ($uid == 0) AND ($contactid != 0) AND ($url != ""))
q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d", q("DELETE FROM `contact` WHERE `nurl` = '%s' AND `id` != %d AND NOT `self`",
dbesc(normalise_link($url)), dbesc(normalise_link($url)),
intval($contactid)); intval($contactid));

4
mod/dfrn_request.php
View file

@ -301,7 +301,7 @@ function dfrn_request_post(App $a) {
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if(! $rr['rel']) { if(! $rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d", q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid']) intval($rr['cid'])
); );
} }
@ -326,7 +326,7 @@ function dfrn_request_post(App $a) {
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
if(! $rr['rel']) { if(! $rr['rel']) {
q("DELETE FROM `contact` WHERE `id` = %d", q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
intval($rr['cid']) intval($rr['cid'])
); );
} }