clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into newui

Browse Source
This commit is contained in:
fabrixxm
2011-08-22 13:56:08 +02:00
parent afdc639f17 564ade0685
commit d8bd4fbb3e
52 changed files with 3730 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mod/contacts.php
View File

@@ -141,7 +141,7 @@ function contacts_content(&$a) {
$cmd = $a->argv[2];
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
intval($contact_id),
intval(local_user())
);
@@ -222,7 +222,7 @@ function contacts_content(&$a) {
}
contact_remove($contact_id);
contact_remove($orig_record[0]['id']);
info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED