Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index c83177ddaa2333117beab39c151a678adadc4ab9..af77869989713c4fec3ae266b0d2859f411240e7 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -197,6 +197,7 @@ function contact_photo_menu($contact) {
        $status_link="";
        $photos_link="";
        $posts_link="";
+       $contact_drop_link = "";
        $poke_link="";
 
        $sparkle = false;
@@ -219,7 +220,9 @@ 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/?cid=' . $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),
        );