strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

if removing a contact after viewing the third page of contacts, go back to page 3

Browse source
This commit is contained in:
friendica 2012-02-08 21:15:26 -08:00
parent 03435853b3
commit 11517a027b
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mod/contacts.php
View file

@ -111,7 +111,6 @@ function contacts_content(&$a) {
$o = ''; $o = '';
nav_set_selected('contacts'); nav_set_selected('contacts');
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
@ -211,7 +210,10 @@ function contacts_content(&$a) {
contact_remove($orig_record[0]['id']); contact_remove($orig_record[0]['id']);
info( t('Contact has been removed.') . EOL ); info( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts'); if(x($_SESSION,'return_url'))
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
else
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED return; // NOTREACHED
} }
} }
@ -354,6 +356,7 @@ function contacts_content(&$a) {
} }
$_SESSION['return_url'] = $a->query_string;
if(($a->argc == 2) && ($a->argv[1] === 'all')) if(($a->argc == 2) && ($a->argv[1] === 'all'))
$sql_extra = ''; $sql_extra = '';