aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-07-14 13:46:22 +0200
committerMario Vavti <mario@mariovavti.com>2015-07-14 13:46:22 +0200
commitdd57864867da2a1ddaf7b96094f924de9a3262a4 (patch)
tree13184fae1541e0bc8d04bfb3de7d43596188e126
parentd8edb66287d7f5423c7a4ca8f87ae949465f3b68 (diff)
downloadvolse-hubzilla-dd57864867da2a1ddaf7b96094f924de9a3262a4.tar.gz
volse-hubzilla-dd57864867da2a1ddaf7b96094f924de9a3262a4.tar.bz2
volse-hubzilla-dd57864867da2a1ddaf7b96094f924de9a3262a4.zip
revert provide inherited perms for connection default permissions
-rw-r--r--mod/connedit.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index a769ed686..39a69364d 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -650,7 +650,7 @@ 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) ? '' : '1'), $v[4]);
+ $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]);
}
$o .= replace_macros($tpl,array(