Ticket #38867: 38867.2.diff

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

@@ -1353 +1353 @@
 
                 wp_enqueue_script( 'customize-preview' );
                 add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
+                add_action( 'wp_head', array( $this, 'remove_frameless_preview_messenger_channel' ) );
                 add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
                 add_filter( 'get_edit_post_link', '__return_empty_string' );
 
@@ -1488 +1489 @@
         }
 
         /**
+         * Remove customize_messenger_channel query parameter from the preview window when it is not in an iframe.
+         *
+         * This ensures that the admin bar will be shown. It also ensures that link navigation will
+         * work as expected since the parent frame is not being sent the URL to navigate to.
+         *
+         * @since 4.7.0
+         * @access public
+         */
+        public function remove_frameless_preview_messenger_channel( ){
+                if ( ! $this->messenger_channel ) {
+                        return;
+                }
+                ?>
+                <script>
+                ( function() {
+                        var urlParser, oldQueryParams, newQueryParams, i;
+                        if ( parent !== window ) {
+                                return;
+                        }
+                        urlParser = document.createElement( 'a' );
+                        urlParser.href = location.href;
+                        oldQueryParams = urlParser.search.substr( 1 ).split( /&/ );
+                        newQueryParams = [];
+                        for ( i = 0; i < oldQueryParams.length; i += 1 ) {
+                                if ( ! /^customize_messenger_channel=/.test( oldQueryParams[ i ] ) ) {
+                                        newQueryParams.push( oldQueryParams[ i ] );
+                                }
+                        }
+                        urlParser.search = newQueryParams.join( '&' );
+                        if ( urlParser.search !== location.search ) {
+                                location.replace( urlParser.href );
+                        }
+                } )();
+                </script>
+                <?php
+        }
+
+        /**
          * Print JavaScript settings for preview frame.
          *
          * @since 3.4.0

tests/phpunit/tests/customize/manager.php

@@ -460 +460 @@
                 $this->assertEquals( $did_action_customize_preview_init + 1, did_action( 'customize_preview_init' ) );
 
                 $this->assertEquals( 10, has_action( 'wp_head', 'wp_no_robots' ) );
+                $this->assertEquals( 10, has_action( 'wp_head', array( $wp_customize, 'remove_frameless_preview_messenger_channel' ) ) );
                 $this->assertEquals( 10, has_filter( 'wp_headers', array( $wp_customize, 'filter_iframe_security_headers' ) ) );
                 $this->assertEquals( 10, has_filter( 'wp_redirect', array( $wp_customize, 'add_state_query_params' ) ) );
                 $this->assertTrue( wp_script_is( 'customize-preview', 'enqueued' ) );