Go to referring Page after login

[plb]

Here's for 4.1.5:

Changes to login.php:
http://pastebin.com/sEz1rzzw

I have shamelessly left in my plug for a login.php?err=My+Error+Message in the URL to allow users to be redirected back to login with a reported error. That is obviously unrelated to this problem/solution and can be left out (if you have to - grin).

Changes to us_helpers.php:
http://pastebin.com/wpdcHDSL

Note that I have my Redirect::to() function allowing an argument for the $_GET side of things. In vanilla US you would need to change

Code:

Redirect::to($us_url_root.'users/login.php', '?afterLoginGoto='.$_SERVER['PHP_SELF']);

to

Code:

Redirect::to($us_url_root.'users/login.php?afterLoginGoto='.$_SERVER['PHP_SELF']);

on line 395

For more details on the change to Redirect.php, you can see the code I posted earlier here:
http://pastebin.com/yvSx71U1
This change is *not* necessary in order to implement the changes above - you just have to modify the code as I have delineated. I'm just posting this extra reference to Redirect.php as a reminder of what change I was talking about.