Merge pull request #53 from Alhrath/master

Debug login from frontend
michaelryanmcneill · Aug 19, 2019 · a7ccb3e · a7ccb3e
2 parents 06096f2 + 282c31e
commit a7ccb3e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/shibboleth.php b/shibboleth.php
@@ -861,7 +861,12 @@ function shibboleth_custom_password_reset_url( $url ) {
  * @since 1.0
  */
 function shibboleth_login_form() {
-	$login_url = add_query_arg( 'action', 'shibboleth' );
+	global $wp;
+	$url = false;
+	if ( isset( $wp->request ) ) {
+		$url = wp_login_url( home_url( $wp->request ) );
+	}
+	$login_url = add_query_arg( 'action', 'shibboleth', $url );
 	$login_url = remove_query_arg( 'reauth', $login_url );
 	$button_text = shibboleth_getoption( 'shibboleth_button_text', 'Log in with Shibboleth' );
 	$disable = shibboleth_getoption( 'shibboleth_disable_local_auth', false );