diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:39:09 -0800 |
| commit | 0657195125675700eeb9bcd1bc92f4299cac0304 (patch) | |
| tree | 2e6d2df8fd42b289b947a16f0c5f0009a2c98043 /mod/connedit.php | |
| parent | a1e5a661fa8f87793cab0fe9c34f507dafb65d99 (diff) | |
| parent | 087d6744fcd0c77cf3415b4ce6eaf50cdb63b4ef (diff) | |
| download | volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.gz volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.tar.bz2 volse-hubzilla-0657195125675700eeb9bcd1bc92f4299cac0304.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'mod/connedit.php')
| -rw-r--r-- | mod/connedit.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 6729029ac..abab0416e 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -216,10 +216,9 @@ function connedit_post(&$a) { $arr = array('channel_id' => local_user(), 'abook' => $a->poi); call_hooks('accept_follow', $arr); } -dbg(1); + if(! is_null($autoperms)) set_pconfig(local_user(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0)); -dbg(0); connedit_clone($a); @@ -242,7 +241,7 @@ function connedit_clone(&$a) { unset($clone['abook_account']); unset($clone['abook_channel']); - build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone))); + build_sync_packet(0 /* use the current local_user */, array(array('abook' => array($clone)))); } /* @brief Generate content of connection edit page @@ -403,9 +402,9 @@ function connedit_content(&$a) { contact_remove(local_user(), $orig_record[0]['abook_id']); build_sync_packet(0 /* use the current local_user */, - array('abook' => array( + array(array('abook' => array( 'abook_xchan' => $orig_record[0]['abook_xchan'], - 'entry_deleted' => true) + 'entry_deleted' => true)) ) ); |