From: friendica <info@friendica.com>
Date: Fri, 20 Jul 2012 04:27:22 +0000 (-0700)
Subject: and the main photo menu
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9c72b45f36dcdf141c0698c2e6219bf914827881;p=friendica.git

and the main photo menu
---

diff --git a/include/conversation.php b/include/conversation.php
index 44cd92c391..4a9142bb20 100644
--- 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 f4660e624d..8fdbaa5170 100644
--- 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');