Merge branch 'master' into newui

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index eb1de25ad8f69c01953dabe881542a35d955644e..e4be93cd5c13d6b162f58e47a9c632a863f5c8e3 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -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