X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=7cac3c0e0ca9a3b555b1569a1bb05d0461ddc418;hb=2856664eeb44bfb2b1190965562b55740dc22113;hp=a915ae0b444883045097ccfb6d8a8e91e9c64b48;hpb=c7c3db8c54ada33c785a7303de582a3d0c1a14ee;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index a915ae0b44..7cac3c0e0c 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -6,6 +6,10 @@
 // authorisation to do this.
 
 function user_remove($uid) {
+	if(! $uid)
+		return;
+	$a = get_app();
+	logger('Removing user: ' . $uid);
 	q("DELETE FROM `contact` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
@@ -16,10 +20,10 @@ function user_remove($uid) {
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
-	if($uid == get_uid()) {
+	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
 		unset($_SESSION['uid']);
-		killme();
+		goaway($a->get_baseurl());
 	}
 }
 
@@ -34,6 +38,9 @@ function contact_remove($id) {
 	q("DELETE FROM `photo` WHERE `contact-id` = %d ",
 		intval($id)
 	);
+	q("DELETE FROM `mail` WHERE `contact-id` = %d ",
+		intval($id)
+	);
 }