friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

and the main photo menu

pull/401/head
friendica 2012-07-19 21:27:22 -07:00
parent 64bd634582
commit 9c72b45f36
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/conversation.php
View File

@ -910,6 +910,7 @@ function item_photo_menu($item){
if(! count($a->contacts)) if(! count($a->contacts))
load_contact_links(local_user()); load_contact_links(local_user());
} }
$poke_link="";
$contact_url=""; $contact_url="";
$pm_url=""; $pm_url="";
$status_link=""; $status_link="";
@ -939,6 +940,7 @@ function item_photo_menu($item){
} }
} }
if(($cid) && (! $item['self'])) { if(($cid) && (! $item['self'])) {
$poke_link = $a->get_baseurl($ssl_state) . '/poke/?f=&c=' . $cid;
$contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid; $contact_url = $a->get_baseurl($ssl_state) . '/contacts/' . $cid;
$posts_link = $a->get_baseurl($ssl_state) . '/network/?cid=' . $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("Network Posts") => $posts_link,
t("Edit Contact") => $contact_url, t("Edit Contact") => $contact_url,
t("Send PM") => $pm_url, t("Send PM") => $pm_url,
t("Poke") => $poke_link
); );
@ -972,7 +975,7 @@ function item_photo_menu($item){
$o = ""; $o = "";
foreach($menu as $k=>$v){ 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; return $o;
}} }}

3
mod/poke.php
View File

@ -150,7 +150,8 @@ EOT;
$shortlist = array(); $shortlist = array();
foreach($verbs as $k => $v) 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'); $tpl = get_markup_template('poke_content.tpl');