jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The photo menu now respects if the local users differs from the contact owner

Browse source
This commit is contained in:
Michael Vogel 2015-11-29 09:35:35 +01:00
parent 25c0c5d4ad
commit 00cc409461
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/Contact.php
View file

@ -286,7 +286,7 @@ function get_contact_details_by_url($url, $uid = -1) {
} }
if(! function_exists('contact_photo_menu')){ if(! function_exists('contact_photo_menu')){
function contact_photo_menu($contact) { function contact_photo_menu($contact, $uid = 0) {
$a = get_app(); $a = get_app();
@ -298,6 +298,33 @@ function contact_photo_menu($contact) {
$contact_drop_link = ""; $contact_drop_link = "";
$poke_link=""; $poke_link="";
if ($uid == 0)
$uid = local_user();
if ($contact["uid"] != $uid) {
if ($uid == 0) {
$profile_link = zrl($contact['url']);
$menu = Array('profile' => array(t("View Profile"), $profile_link, true));
return $menu;
}
$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
if ($r)
return contact_photo_menu($r[0], $uid);
else {
$profile_link = zrl($contact['url']);
$connlnk = 'follow/?url='.$contact['url'];
$menu = Array(
'profile' => array(t("View Profile"), $profile_link, true),
'follow' => array(t("Connect/Follow"), $connlnk, true)
);
return $menu;
}
}
$sparkle = false; $sparkle = false;
if($contact['network'] === NETWORK_DFRN) { if($contact['network'] === NETWORK_DFRN) {
$sparkle = true; $sparkle = true;