Ticket #35355: 35355.2.diff

src/wp-includes/class-wp-customize-manager.php

@@ -1579 +1579 @@
          */
         public function get_return_url() {
                 $referer = wp_get_referer();
+                $excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+
                 if ( $this->return_url ) {
                         $return_url = $this->return_url;
-                } else if ( $referer && 'customize.php' !== basename( parse_url( $referer, PHP_URL_PATH ) ) ) {
+                } else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
                         $return_url = $referer;
                 } else if ( $this->preview_url ) {
                         $return_url = $this->preview_url;

tests/phpunit/tests/customize/manager.php

@@ -322 +322 @@
                 $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'customize.php' ) );
                 $this->assertEquals( $preview_url, $this->manager->get_return_url() );
 
+                // See #35355.
+                $_SERVER['HTTP_REFERER'] = wp_slash( admin_url( 'wp-login.php' ) );
+                $this->assertEquals( $preview_url, $this->manager->get_return_url() );
+
                 $url = home_url( '/referred/' );
                 $_SERVER['HTTP_REFERER'] = wp_slash( $url );
                 $this->assertEquals( $url, $this->manager->get_return_url() );