properly handle redirecting back to requested page after logging in (closes #302)

1 files changed, 6 insertions, 1 deletions

diff --git a/functions.php b/functions.php
index 64269aada..0bbefd581 100644
--- a/functions.php
+++ b/functions.php
@@ -1985,7 +1985,12 @@
 						}
 					}
 
-					header("Location: " . $_SERVER["REQUEST_URI"]);
+					if ($_REQUEST['return']) {
+						header("Location: " . $_REQUEST['return']);
+					} else {
+						header("Location: " . $_SERVER["REQUEST_URI"]);
+					}
+
 					exit;
 
 					return;