Changeset 12237 for sites/trunk/common/includes/wporg-sso/class-wporg-sso.php

Timestamp:

11/11/2022 03:36:41 AM (4 years ago)

Author:

dd32

Message:

Login: SSO: In the event that headers have already been sent when we redirect, output a HTML redirect and end the process, do not just return.

File:

• sites/trunk/common/includes/wporg-sso/class-wporg-sso.php (modified) (3 diffs)

sites/trunk/common/includes/wporg-sso/class-wporg-sso.php

@@ -221 +221 @@
                  */
                 protected function _safe_redirect( $to, $status = 302 ) {
-                        if ( headers_sent() ) {
-                                return;
-                        }
 
                         // When available, sanitize the redirect prior to redirecting.
@@ -238 +235 @@
                         if ( function_exists( 'apply_filters' ) ) {
                                 $to = apply_filters( 'wp_redirect', $to, $status );
+                        }
+
+                        // In the event headers have been sent already, output a HTML redirect.
+                        if ( headers_sent() ) {
+                                if ( function_exists( 'esc_url' ) ) {
+                                        $to = esc_url( $to );
+                                } else {
+                                        // This is not a replacement for esc_url().
+                                        $to = htmlspecialchars( $to, ENT_QUOTES | ENT_SUBSTITUTE );
+                                }
+
+                                printf(
+                                        '<meta http-equiv="refresh" content="1;url=%1$s" />' . 
+                                        '<a href="%1$s">%1$s</a>',
+                                        $to
+                                );
+                                exit;
                         }
 
@@ -245 +259 @@
                                 preg_match( '/^30(1|2)$/', $status ) ? $status : 302
                         );
-
-                        die();
+                        exit;
                 }
         }