bug fix #1115

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index ce1edbcc2164cc2336047fcfc9b08dcc1449037d..a6429bbf49eced95df08533580c48bfd3087327f 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -64,13 +64,13 @@ function contact_remove($id) {
 
        $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
        if($archive) {
-               q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+               q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
                        intval($id)
                );
                return;
        }
 
-       q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
+       q("DELETE FROM `contact` WHERE `id` = %d",
                intval($id)
        );
        q("DELETE FROM `item` WHERE `contact-id` = %d ",
@@ -148,7 +148,7 @@ function mark_for_death($contact) {
                return;
 
        if($contact['term-date'] == '0000-00-00 00:00:00') {
-               q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+               q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                                dbesc(datetime_convert()),
                                intval($contact['id'])
                );
@@ -166,7 +166,7 @@ function mark_for_death($contact) {
                        // archive them rather than delete
                        // though if the owner tries to unarchive them we'll start the whole process over again
 
-                       q("update contact set `archive` = 1 where id = %d limit 1",
+                       q("update contact set `archive` = 1 where id = %d",
                                intval($contact['id'])
                        );
                        q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
@@ -181,7 +181,7 @@ function mark_for_death($contact) {
 if(! function_exists('unmark_for_death')) {
 function unmark_for_death($contact) {
        // It's a miracle. Our dead contact has inexplicably come back to life.
-       q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
+       q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d",
                dbesc('0000-00-00 00:00:00'),
                intval($contact['id'])
        );
@@ -215,13 +215,14 @@ function contact_photo_menu($contact) {
                $status_link = $profile_link . "?url=status";
                $photos_link = $profile_link . "?url=photos";
                $profile_link = $profile_link . "?url=profile";
-               $contact_drop_link = $a->get_baseurl() . '/contacts/' . $contact['id'] . '/drop';
                $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
        }
 
        $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
        $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
        $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
+       $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+       
 
        $menu = Array(
                'poke' => array(t("Poke"), $poke_link),