aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/diaspora.php2
-rw-r--r--version.inc2
2 files changed, 2 insertions, 2 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;
diff --git a/version.inc b/version.inc
index ff47debf0..7386960a0 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-01-30.932
+2015-01-31.933