From 8680068037e3ff3877684176333d2323a8fd1e7e Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 19 Apr 2017 21:58:33 -0400
Subject: [PATCH 1/2] Remove vcard Edit link pointing to profiles for contacts
---
include/identity.php | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/include/identity.php b/include/identity.php
index 670337e08..9e34e061c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -202,6 +202,9 @@ function profile_sidebar($profile, $block = 0) {
$address = false;
// $pdesc = true;
+ // This function can also use contact information in $profile
+ $is_contact = x($profile, 'cid');
+
if((! is_array($profile)) && (! count($profile)))
return $o;
@@ -280,8 +283,10 @@ function profile_sidebar($profile, $block = 0) {
$wallmessage_link = false;
}
+ var_dump($profile);
+
// show edit profile to yourself
- if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
+ if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());
@@ -310,7 +315,7 @@ function profile_sidebar($profile, $block = 0) {
}
}
- if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
+ if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
$profile['menu'] = array(
'chg_photo' => t('Change profile photo'),
From 37efb5725e9469bb8af26874a3f7b174848dfcdd Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 19 Apr 2017 23:31:38 -0400
Subject: [PATCH 2/2] Remove debug
---
include/identity.php | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/identity.php b/include/identity.php
index 9e34e061c..a21624a21 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -283,8 +283,6 @@ function profile_sidebar($profile, $block = 0) {
$wallmessage_link = false;
}
- var_dump($profile);
-
// show edit profile to yourself
if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));