harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syncing connections issue, incorrect return_url after deleting connection

Browse Source
This commit is contained in:
friendica
2015-01-07 14:35:03 -08:00
parent 3ef487418d
commit ce953e2f41
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mod/connedit.php
View File

@@ -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))
)
);