Changeset 56749

Timestamp:

09/29/2023 09:37:06 PM (10 months ago)

Author:

westonruter

Message:

Customize: Harden and modernize URL manipulation in WP_Customize_Manager::remove_frameless_preview_messenger_channel().

Since IE11 is no longer supported, the URL and URLSearchParams APIs can now be leveraged for simpler and more robust URL manipulation. This was done similarly in [56383] for embed.js.

Props nicolefurlan, dmsnell, westonruter.
Fixes #59480.

File:

• trunk/src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)

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

@@ -2090 +2090 @@
         <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 );
+            const url = new URL( location.href );
+            if ( url.searchParams.has( 'customize_messenger_channel' ) ) {
+                url.searchParams.delete( 'customize_messenger_channel' );
+                location.replace( url );
             }
         } )();