diff options
| author | friendica <info@friendica.com> | 2015-02-01 20:30:47 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-01 20:30:47 -0800 |
| commit | aafed50a0ea8a8d7091572473dcb8e4fb8cd4602 (patch) | |
| tree | 66b27325cd7bcce748965aebb29ab8a1da2f340d /include/diaspora.php | |
| parent | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (diff) | |
| parent | e58bef049d7736d448f7bb5688affe491b9e24b1 (diff) | |
| download | volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.gz volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.tar.bz2 volse-hubzilla-aafed50a0ea8a8d7091572473dcb8e4fb8cd4602.zip | |
Merge branch 'master' into tres
Diffstat (limited to 'include/diaspora.php')
| -rwxr-xr-x | include/diaspora.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 82a59a73f..447fd363a 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; |