X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FContact.php;h=a6429bbf49eced95df08533580c48bfd3087327f;hb=a162ea725139bee852e2dee6f5963a6d34106fee;hp=04d3fa9e5d013a0a426b7c8af155fbd90edebdf9;hpb=79e9214a755e32e2a2e381961dcce9297eb422ee;p=friendica.git

diff --git a/include/Contact.php b/include/Contact.php
index 04d3fa9e5d..a6429bbf49 100644
--- 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'])
 	);
@@ -197,6 +197,7 @@ function contact_photo_menu($contact) {
 	$status_link="";
 	$photos_link="";
 	$posts_link="";
+	$contact_drop_link = "";
 	$poke_link="";
 
 	$sparkle = false;
@@ -220,6 +221,8 @@ function contact_photo_menu($contact) {
 	$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),
@@ -228,6 +231,7 @@ function contact_photo_menu($contact) {
 		'photos' => array(t("View Photos"), $photos_link),		
 		'network' => array(t("Network Posts"), $posts_link), 
 		'edit' => array(t("Edit Contact"), $contact_url),
+		'drop' => array(t("Drop Contact"), $contact_drop_link),
 		'pm' => array(t("Send PM"), $pm_url),
 	);