diff options
| author | friendica <info@friendica.com> | 2015-01-07 14:35:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-07 14:35:03 -0800 |
| commit | ce953e2f41c2bf8abdda2584dd84c2bd0175f609 (patch) | |
| tree | 25a89639cd5de07fc1553c2a4f0c02c6aa171ee6 /mod | |
| parent | 3ef487418df8465143cc0393803b2a1ff221697f (diff) | |
| download | volse-hubzilla-ce953e2f41c2bf8abdda2584dd84c2bd0175f609.tar.gz volse-hubzilla-ce953e2f41c2bf8abdda2584dd84c2bd0175f609.tar.bz2 volse-hubzilla-ce953e2f41c2bf8abdda2584dd84c2bd0175f609.zip | |
syncing connections issue, incorrect return_url after deleting connection
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 3 | ||||
| -rw-r--r-- | mod/connedit.php | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mod/connections.php b/mod/connections.php index 70e28913a..d36734ccb 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -179,7 +179,8 @@ function connections_content(&$a) { $unconnected = false; $all = false; - $_SESSION['return_url'] = $a->query_string; + if(! $_REQUEST['aj']) + $_SESSION['return_url'] = $a->query_string; $search_flags = 0; $head = ''; 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)) ) ); |