and the main photo menu

diff --git a/include/conversation.php b/include/conversation.php
index 44cd92c3918ff5df4769aafdf17110503f653da2..4a9142bb202285c6553a2a2dd2e2317ea9c914fd 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -910,6 +910,7 @@ function item_photo_menu($item){
                 if(! count($a->contacts))
                        load_contact_links(local_user());
        }
+       $poke_link="";
        $contact_url="";
        $pm_url="";
        $status_link="";
@@ -939,6 +940,7 @@ function item_photo_menu($item){
                }
        }
        if(($cid) && (! $item['self'])) {
+               $poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
                $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
                $posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $cid;
 
@@ -961,6 +963,7 @@ function item_photo_menu($item){
                t("Network Posts") => $posts_link, 
                t("Edit Contact") => $contact_url,
                t("Send PM") => $pm_url,
+               t("Poke") => $poke_link
        );
        
        
@@ -972,7 +975,7 @@ function item_photo_menu($item){
 
        $o = "";
        foreach($menu as $k=>$v){
-               if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+               if ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
        }
        return $o;
 }}

diff --git a/mod/poke.php b/mod/poke.php
index f4660e624db2d4d86f71bee832b213795ee5e6cc..8fdbaa5170767072db43d1738adc60747736ab33 100644 (file)
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -150,7 +150,8 @@ EOT;
 
        $shortlist = array();
        foreach($verbs as $k => $v)
-               $shortlist[] = array($k,$v[1]);
+               if($v[1] !== 'NOTRANSLATION')
+                       $shortlist[] = array($k,$v[1]);
 
 
        $tpl = get_markup_template('poke_content.tpl');