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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -221,7 +221,7 @@ define ( 'PAGE_NORMAL', 0x0000 );
define ( 'PAGE_HIDDEN', 0x0001 ); define ( 'PAGE_HIDDEN', 0x0001 );
define ( 'PAGE_AUTOCONNECT', 0x0002 ); define ( 'PAGE_AUTOCONNECT', 0x0002 );
define ( 'PAGE_APPLICATION', 0x0004 ); define ( 'PAGE_APPLICATION', 0x0004 );
define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for directory synchronisation
define ( 'PAGE_PREMIUM', 0x0010 ); define ( 'PAGE_PREMIUM', 0x0010 );
define ( 'PAGE_ADULT', 0x0020 ); define ( 'PAGE_ADULT', 0x0020 );
define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds define ( 'PAGE_CENSORED', 0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds

2
include/Contact.php
View File

@ -519,6 +519,8 @@ function contact_remove($channel_id, $abook_id) {
if((! $channel_id) || (! $abook_id)) if((! $channel_id) || (! $abook_id))
return false; return false;
logger('removing contact ' . $abook_id . ' for channel ' . $channel_id,LOGGER_DEBUG);
$archive = get_pconfig($channel_id, 'system','archive_removed_contacts'); $archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
if($archive) { if($archive) {
q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d", q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d",

1
mod/connections.php
View File

@ -179,6 +179,7 @@ function connections_content(&$a) {
$unconnected = false; $unconnected = false;
$all = false; $all = false;
if(! $_REQUEST['aj'])
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
$search_flags = 0; $search_flags = 0;

9
mod/connedit.php
View File

@ -216,10 +216,9 @@ function connedit_post(&$a) {
$arr = array('channel_id' => local_user(), 'abook' => $a->poi); $arr = array('channel_id' => local_user(), 'abook' => $a->poi);
call_hooks('accept_follow', $arr); call_hooks('accept_follow', $arr);
} }
dbg(1);
if(! is_null($autoperms)) if(! is_null($autoperms))
set_pconfig(local_user(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0)); set_pconfig(local_user(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0));
dbg(0);
connedit_clone($a); connedit_clone($a);
@ -242,7 +241,7 @@ function connedit_clone(&$a) {
unset($clone['abook_account']); unset($clone['abook_account']);
unset($clone['abook_channel']); 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 /* @brief Generate content of connection edit page
@ -403,9 +402,9 @@ function connedit_content(&$a) {
contact_remove(local_user(), $orig_record[0]['abook_id']); contact_remove(local_user(), $orig_record[0]['abook_id']);
build_sync_packet(0 /* use the current local_user */, build_sync_packet(0 /* use the current local_user */,
array('abook' => array( array(array('abook' => array(
'abook_xchan' => $orig_record[0]['abook_xchan'], 'abook_xchan' => $orig_record[0]['abook_xchan'],
'entry_deleted' => true) 'entry_deleted' => true))
) )
); );

2
version.inc
View File

@ -1 +1 @@
2015-01-06.911 2015-01-07.912