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

diff --git a/mod/contacts.php b/mod/contacts.php
index 51c6920d348db5c2f93a8cc7069d2381d5843319..206128f9d0f7429706854ef1e7fa6af9c2d8e9ef 100755 (executable)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -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 = '';