aboutsummaryrefslogtreecommitdiffstats
path: root/include/diaspora.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-31 14:52:29 -0800
committerfriendica <info@friendica.com>2015-01-31 14:52:29 -0800
commita7e5c7ce64f3649cafba48f4c89135dae52a5ca4 (patch)
tree553c4f929f846691d0e6865ddeb740e35bdd052a /include/diaspora.php
parentb597e27c4d68dd2564a265f20789285bfc8a1b30 (diff)
downloadvolse-hubzilla-a7e5c7ce64f3649cafba48f4c89135dae52a5ca4.tar.gz
volse-hubzilla-a7e5c7ce64f3649cafba48f4c89135dae52a5ca4.tar.bz2
volse-hubzilla-a7e5c7ce64f3649cafba48f4c89135dae52a5ca4.zip
issue #885, autoperms not working for diaspora connections
Diffstat (limited to 'include/diaspora.php')
-rwxr-xr-xinclude/diaspora.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php
index 8f2f93209..ada90e476 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -688,7 +688,7 @@ function diaspora_request($importer,$xml) {
$default_perms = $x['perms_accept'];
}
if(! $default_perms)
- $default_perms = intval(get_pconfig($channel['channel_id'],'system','autoperms'));
+ $default_perms = intval(get_pconfig($importer['channel_id'],'system','autoperms'));
$their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES;