Merge pull request #111 from sassafrastech/master

Added check for explicit redirect_to on login page

includes/widgets/wsl.auth.widgets.php

@@ -171,6 +171,17 @@ function wsl_render_auth_widget( $args = array() )
 
 	$no_idp_used = true;
 
+	// Use the provided redirect_to if it is given and this is the login page.
+	if ( in_array( $GLOBALS["pagenow"], array( "wp-login.php", "wp-register.php" ) ) &&
+		 !empty( $_REQUEST["redirect_to"] ) )
+	{
+		$redirect_to = $_REQUEST["redirect_to"];
+	}
+	else
+	{
+		$redirect_to = $current_page_url;
+	}
+
 	// display provider icons
 	foreach( $WORDPRESS_SOCIAL_LOGIN_PROVIDERS_CONFIG AS $item )
 	{
@@ -192,7 +203,7 @@ function wsl_render_auth_widget( $args = array() )
 			}
 
 			// build authentication url
-			$authenticate_url = $authenticate_base_url . "provider=" . $provider_id . "&redirect_to=" . urlencode( $current_page_url );
+			$authenticate_url = $authenticate_base_url . "provider=" . $provider_id . "&redirect_to=" . urlencode( $redirect_to );
 
 			// http://codex.wordpress.org/Function_Reference/esc_url
 			$authenticate_url = esc_url( $authenticate_url );