Merge branch 'pull'

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 6eda0b6c520013a1d312e91be1c6a5d621f5d3dd..45fd368d856812fe04fdd112245cb04e03c9a93f 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -46,6 +46,10 @@ function contact_remove($id) {
        q("DELETE FROM `event` WHERE `cid` = %d ",
                intval($id)
        );
+       q("DELETE FROM `queue` WHERE `cid` = %d ",
+               intval($id)
+       );
+
 }
 
 
@@ -114,8 +118,8 @@ function contact_photo_menu($contact) {
                $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
        }
 
-       $contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-       $posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+       $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+       $posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
        $menu = Array(
                t("View status") => $status_link,
@@ -133,7 +137,12 @@ function contact_photo_menu($contact) {
        
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+               if ($v!="") {
+                       if(($k !== t("View recent")) && ($k !== t("Send PM")))
+                               $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
+                       else
+                               $o .= "<li><a href=\"$v\">$k</a></li>\n";
+               }
        }
        return $o;
 }}