Merge pull request #210 from bcc-code/bugfix/use-safe-redirect-and-exit-on-template-redirects

cs1m0n · web-flow · commit f552bd7af231 · 2026-01-06T15:01:38.000+02:00
Use safe redirect &amp; exit on template redirects
diff --git a/plugins/bcc-login/includes/class-bcc-login-visibility.php b/plugins/bcc-login/includes/class-bcc-login-visibility.php
@@ -178,8 +178,8 @@ function on_template_redirect() {
         // Initiate new login if session has expired
         if ( is_user_logged_in() && !$session_is_valid ) {
             $this->_client->end_login();
-            wp_redirect( wp_login_url($visited_url) );
-            return;
+            wp_safe_redirect( wp_login_url($visited_url) );
+            exit;
         }
 
         // Show everything to editors
@@ -210,8 +210,8 @@ function on_template_redirect() {
             if ( is_user_logged_in() ) {
                 return $this->not_allowed_to_view_page($visited_url);
             } else {
-                wp_redirect( wp_login_url($visited_url) );
-                return;
+                wp_safe_redirect( wp_login_url($visited_url) );
+                exit;
             }
         }
 
@@ -228,8 +228,8 @@ function on_template_redirect() {
             }
 
             if ( !is_user_logged_in() ) {
-                wp_redirect( wp_login_url($visited_url) );
-                return;
+                wp_safe_redirect( wp_login_url($visited_url) );
+                exit;
             }
 
             $user_groups = $this->get_current_user_groups();

Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,8 @@ function on_template_redirect() {`
`178`	`178`	`// Initiate new login if session has expired`
`179`	`179`	`if ( is_user_logged_in() && !$session_is_valid ) {`
`180`	`180`	`$this->_client->end_login();`
`181`		`- wp_redirect( wp_login_url($visited_url) );`
`182`		`- return;`
	`181`	`+ wp_safe_redirect( wp_login_url($visited_url) );`
	`182`	`+ exit;`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`// Show everything to editors`
`@@ -210,8 +210,8 @@ function on_template_redirect() {`
`210`	`210`	`if ( is_user_logged_in() ) {`
`211`	`211`	`return $this->not_allowed_to_view_page($visited_url);`
`212`	`212`	`} else {`
`213`		`- wp_redirect( wp_login_url($visited_url) );`
`214`		`- return;`
	`213`	`+ wp_safe_redirect( wp_login_url($visited_url) );`
	`214`	`+ exit;`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
`@@ -228,8 +228,8 @@ function on_template_redirect() {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`if ( !is_user_logged_in() ) {`
`231`		`- wp_redirect( wp_login_url($visited_url) );`
`232`		`- return;`
	`231`	`+ wp_safe_redirect( wp_login_url($visited_url) );`
	`232`	`+ exit;`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`$user_groups = $this->get_current_user_groups();`