aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-13 17:13:36 -0700
committerfriendica <info@friendica.com>2014-03-13 17:13:36 -0700
commit3cb179aff19d803b91261e410c50b36e4bae1246 (patch)
treee84880e412390f44e67aff1497562e633deed136
parent254885c5ee31b7ab5174161775f5b225fb687e56 (diff)
downloadvolse-hubzilla-3cb179aff19d803b91261e410c50b36e4bae1246.tar.gz
volse-hubzilla-3cb179aff19d803b91261e410c50b36e4bae1246.tar.bz2
volse-hubzilla-3cb179aff19d803b91261e410c50b36e4bae1246.zip
contact_block() not being shown to unauthenticated visitors - even if perms allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place.
-rw-r--r--include/identity.php5
-rwxr-xr-xinclude/text.php6
2 files changed, 7 insertions, 4 deletions
diff --git a/include/identity.php b/include/identity.php
index ed6920e67..efc0d7d87 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -711,10 +711,7 @@ logger('online: ' . $profile['online']);
? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
- if(is_array($observer)
- && perm_is_allowed($profile['uid'],$observer['xchan_hash'],'view_contacts')) {
- $contact_block = contact_block();
- }
+ $contact_block = contact_block();
$channel_menu = false;
$menu = get_pconfig($profile['uid'],'system','channel_menu');
diff --git a/include/text.php b/include/text.php
index 839e63f5e..53b92c05f 100755
--- a/include/text.php
+++ b/include/text.php
@@ -656,6 +656,12 @@ function contact_block() {
$o = '';
$a = get_app();
+ if(! $a->profile['uid'])
+ return;
+
+ if(! perm_is_allowed($a->profile['uid'],get_observer_hash(),'view_contacts'))
+ return;
+
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count');
if($shown === false)