Creating a login link with redirect back to the original page

Hi there,
Thanks for this tip; it’s been useful.

But to get it to work as I expected it to, i.e. to return me to the page I was on where I clicked the login link, I found I had to add something to it, like this:

add_filter( 'login_url', 'my_login_page', 10, 2 );
function my_login_page( $login_url, $redirect ) {
	if( isset( $_SERVER['REQUEST_URI'] ) && 0 != strlen( $_SERVER['REQUEST_URI'] ) ) {
        $redirect = esc_url( $_SERVER['REQUEST_URI'] );
	}
	$redirect_to = '?redirect_to=' . get_permalink();
    return home_url( '/log-in/?redirect_to=' . $redirect );
}

I hope that will be useful to someone else.

I’ve also been looking at your other tip Redirecting WordPress urls for login, logout, and registration.

I’m trying to repeat what I have done for the login link for the registration link, but it doesn’t work. As you haven’t covered it in these tips, does that indicate it’s not possible to do for the registration form?

This is my code that I’m trying and is returning an error:

add_filter( 'register_url', 'my_register_url' );
function my_register_url( $register_url, $redirect ) {
	if( isset( $_SERVER['REQUEST_URI'] ) && 0 != strlen( $_SERVER['REQUEST_URI'] ) ) {
        $redirect = esc_url( $_SERVER['REQUEST_URI'] );
	}
	$redirect_to = '?redirect_to=' . get_permalink();
	return home_url( '/register/?redirect_to=' . $redirect );
}

Can we get the registration form to redirect in the same way?

BTW, I am also using your other snippet to log the user in after successful registration.