Merge pull request #606 from ProgressPlanner/filip/v18/fix-login-redirect

Fix user login redirect

Author: aristath

CHANGELOG.md

@@ -5,6 +5,9 @@ Enhancements:
 
 * Redesign of the admin pages.
 
+Bugs we fixed:
+* Fix redirecting to Progress Planner Dashboard after login.
+
 = 1.7.2 =
 
 * Backported some features from the Progress Planner Pro plugin.

classes/class-base.php

@@ -472,7 +472,7 @@ public function redirect_on_login( $user_login, $user ) {
 			return;
 		}
 
-		if ( isset( $_REQUEST['redirect_to'] ) && '' !== $_REQUEST['redirect_to'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing -- We're not processing any data.
+		if ( isset( $_REQUEST['redirect_to'] ) && '' !== $_REQUEST['redirect_to'] && \admin_url( '/' ) !== $_REQUEST['redirect_to'] ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing -- We're not processing any data.
 			return;
 		}