if removing a contact after viewing the third page of contacts, go back to page 3
This commit is contained in:
parent
03435853b3
commit
11517a027b
1 changed files with 5 additions and 2 deletions
|
@ -111,7 +111,6 @@ function contacts_content(&$a) {
|
|||
$o = '';
|
||||
nav_set_selected('contacts');
|
||||
|
||||
$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
|
||||
|
||||
if(! local_user()) {
|
||||
notice( t('Permission denied.') . EOL);
|
||||
|
@ -211,7 +210,10 @@ function contacts_content(&$a) {
|
|||
|
||||
contact_remove($orig_record[0]['id']);
|
||||
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
|
||||
}
|
||||
}
|
||||
|
@ -354,6 +356,7 @@ function contacts_content(&$a) {
|
|||
|
||||
}
|
||||
|
||||
$_SESSION['return_url'] = $a->query_string;
|
||||
|
||||
if(($a->argc == 2) && ($a->argv[1] === 'all'))
|
||||
$sql_extra = '';
|
||||
|
|
Loading…
Reference in a new issue