Changeset 58973

Timestamp:

09/03/2024 04:39:29 PM (6 weeks ago)

Author:

joedolson

Message:

Customize: Sanitize autofocus URL parameter as an array.

[58069] introduced calling sanitize_text_field() with $_REQUESTautofocus? (which is an array) and setting its default to a string. This fix restores the array data type for autofocus.

The fix also relocates the unslash for url, return, and autofocus before sanitizing.

Follow-up to [58069], [34269], [29026], [21028].

Reviewed by joedolson.
Merges [58804] to the 6.6 branch.

Props jamesros161, swissspidy, dlh, audrasjb, hellofromTonya, ironprogrammer, debarghyabanerjee.
Fixes #61561.

Location:

branches/6.6

Files:

• . (modified) (1 prop)
• src/wp-admin/customize.php (modified) (1 diff)

branches/6.6/src/wp-admin/customize.php

@@ -85 +85 @@
 }
 
-$url       = ! empty( $_REQUEST['url'] ) ? sanitize_text_field( $_REQUEST['url'] ) : '';
-$return    = ! empty( $_REQUEST['return'] ) ? sanitize_text_field( $_REQUEST['return'] ) : '';
-$autofocus = ! empty( $_REQUEST['autofocus'] ) ? sanitize_text_field( $_REQUEST['autofocus'] ) : '';
+$url       = ! empty( $_REQUEST['url'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['url'] ) ) : '';
+$return    = ! empty( $_REQUEST['return'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['return'] ) ) : '';
+$autofocus = ! empty( $_REQUEST['autofocus'] ) && is_array( $_REQUEST['autofocus'] )
+    ? array_map( 'sanitize_text_field', wp_unslash( $_REQUEST['autofocus'] ) )
+    : array();
 
 if ( ! empty( $url ) ) {
-    $wp_customize->set_preview_url( wp_unslash( $url ) );
+    $wp_customize->set_preview_url( $url );
 }
 if ( ! empty( $return ) ) {
-    $wp_customize->set_return_url( wp_unslash( $return ) );
-}
-if ( ! empty( $autofocus ) && is_array( $autofocus ) ) {
-    $wp_customize->set_autofocus( wp_unslash( $autofocus ) );
+    $wp_customize->set_return_url( $return );
+}
+if ( ! empty( $autofocus ) ) {
+    $wp_customize->set_autofocus( $autofocus );
 }