diff options
| author | Mario <mario@mariovavti.com> | 2021-10-30 09:05:24 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-10-30 09:05:24 +0000 |
| commit | 25ffd39519a69fea946c8af56bc9b1bbe3baf2e6 (patch) | |
| tree | 5ab03eaac4db121dd1be9f0fcc4c106bfa2c8ab8 | |
| parent | b512416cb36197becec3074ad9cf5174ac5ae75d (diff) | |
| parent | acfa527e3e3a4cfa44a8f5148c3409a284b7f253 (diff) | |
| download | volse-hubzilla-25ffd39519a69fea946c8af56bc9b1bbe3baf2e6.tar.gz volse-hubzilla-25ffd39519a69fea946c8af56bc9b1bbe3baf2e6.tar.bz2 volse-hubzilla-25ffd39519a69fea946c8af56bc9b1bbe3baf2e6.zip | |
Merge branch 'dev' into 6.4RC
| -rw-r--r-- | include/permissions.php | 2 | ||||
| -rw-r--r-- | view/tpl/xchan_vcard.tpl | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/permissions.php b/include/permissions.php index 33b385490..9e432ce51 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -50,6 +50,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ // First find out what the channel owner declared permissions to be. $channel_perm = intval(\Zotlabs\Access\PermissionLimits::Get($uid,$perm_name)); +hz_syslog(print_r($channel_perm,true)); if(! $channel_checked) { $r = q("select * from channel where channel_id = %d limit 1", @@ -242,6 +243,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ call_hooks('get_all_perms',$arr); + return $arr['permissions']; } diff --git a/view/tpl/xchan_vcard.tpl b/view/tpl/xchan_vcard.tpl index 5f29a266e..2fd9bec1d 100644 --- a/view/tpl/xchan_vcard.tpl +++ b/view/tpl/xchan_vcard.tpl @@ -6,11 +6,11 @@ </a> </div> <div class="col-7 m-1"> - <div> - <strong class="fn p-name text-truncate">{{$name}}</strong> + <div class="text-truncate"> + <strong class="fn p-name">{{$name}}</strong> </div> - <div> - <small class="text-muted p-adr text-truncate">{{$addr}}</small> + <div class="text-truncate"> + <small class="text-muted p-adr">{{$addr}}</small> </div> {{if $connect}} <div class="mt-1"> |