aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-07-14 13:16:08 +0200
committerMario Vavti <mario@mariovavti.com>2015-07-14 13:16:08 +0200
commit711dd1468db2116a2003494d4fe6d8a7c5ed7c7b (patch)
tree0026eb9d3138fe84dca4ced1936d0a9d12c2240d
parenta28da40fa8937e87d633689527c84594a771855d (diff)
downloadvolse-hubzilla-711dd1468db2116a2003494d4fe6d8a7c5ed7c7b.tar.gz
volse-hubzilla-711dd1468db2116a2003494d4fe6d8a7c5ed7c7b.tar.bz2
volse-hubzilla-711dd1468db2116a2003494d4fe6d8a7c5ed7c7b.zip
provide inherited perms for connection default permissions
-rw-r--r--mod/connedit.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index 39a69364d..a72714a1d 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -650,9 +650,11 @@ function connedit_content(&$a) {
if((! $self) && ($existing[$k]))
$thisperm = "1";
- $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC || $self) ? '' : '1'), $v[4]);
+ $perms[] = array('perms_' . $k, $v[3], (($contact['abook_their_perms'] & $v[1]) ? "1" : ""),$thisperm, $v[1], (($channel[$v[0]] == PERMS_SPECIFIC) ? '' : '1'), $v[4]);
}
+ //print_r($perms); killme();
+
$o .= replace_macros($tpl,array(
'$header' => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),