enmi-conf.org: comparison wp/wp-includes/class-wp-customize-manager.php

equal deleted inserted replaced

-:c7c34916027a
+:177826044cd9
 	/**
 	 * Constructor.
 	 *
 	 * @since 3.4.0
-	 * @since 4.7.0 Added $args param.
+	 * @since 4.7.0 Added `$args` parameter.
 	 *
 	 * @param array $args {
 	 *     Args.
 	 *
 	 *     @type null|string|false $changeset_uuid     Changeset UUID, the `post_name` for the customize_changeset post containing the customized state.
 		if ( ! isset( $args['messenger_channel'] ) && isset( $_REQUEST['customize_messenger_channel'] ) ) {
 			$args['messenger_channel'] = sanitize_key( wp_unslash( $_REQUEST['customize_messenger_channel'] ) );
 		}
 		$this->original_stylesheet = get_stylesheet();
-		$this->theme = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
+		$this->theme               = wp_get_theme( 0 === validate_file( $args['theme'] ) ? $args['theme'] : null );
-		$this->messenger_channel = $args['messenger_channel'];
+		$this->messenger_channel   = $args['messenger_channel'];
-		$this->_changeset_uuid = $args['changeset_uuid'];
+		$this->_changeset_uuid     = $args['changeset_uuid'];
 		foreach ( array( 'settings_previewed', 'autosaved', 'branching' ) as $key ) {
 			if ( isset( $args[ $key ] ) ) {
 				$this->$key = (bool) $args[ $key ];
 			}
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-locations-control.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in 5.0. See #42364.
+		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' ); // @todo Remove in a future release. See #42364.
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-panel.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in 5.0. See #42364.
+		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' ); // @todo Remove in a future release. See #42364.
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
 		 *
 		 * @since 4.4.0
 		 *
 		 * @see WP_Customize_Manager::__construct()
 		 *
-		 * @param array                $components List of core components to load.
+		 * @param string[]             $components Array of core components to load.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
 		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
 		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
 			require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
 			$this->nav_menus = new WP_Customize_Nav_Menus( $this );
 		}
 		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action( 'wp_loaded', array( $this, 'wp_loaded' ) );
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
 		remove_action( 'init', 'wp_cron' );
 		// Do not run update checks when rendering the controls.
 		remove_action( 'admin_init', '_maybe_update_core' );
 		remove_action( 'admin_init', '_maybe_update_plugins' );
 		remove_action( 'admin_init', '_maybe_update_themes' );
-		add_action( 'wp_ajax_customize_save',                     array( $this, 'save' ) );
+		add_action( 'wp_ajax_customize_save', array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_trash',                    array( $this, 'handle_changeset_trash_request' ) );
+		add_action( 'wp_ajax_customize_trash', array( $this, 'handle_changeset_trash_request' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces',           array( $this, 'refresh_nonces' ) );
+		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
-		add_action( 'wp_ajax_customize_load_themes',              array( $this, 'handle_load_themes_request' ) );
+		add_action( 'wp_ajax_customize_load_themes', array( $this, 'handle_load_themes_request' ) );
-		add_filter( 'heartbeat_settings',                         array( $this, 'add_customize_screen_to_heartbeat_settings' ) );
+		add_filter( 'heartbeat_settings', array( $this, 'add_customize_screen_to_heartbeat_settings' ) );
-		add_filter( 'heartbeat_received',                         array( $this, 'check_changeset_lock_with_heartbeat' ), 10, 3 );
+		add_filter( 'heartbeat_received', array( $this, 'check_changeset_lock_with_heartbeat' ), 10, 3 );
-		add_action( 'wp_ajax_customize_override_changeset_lock',  array( $this, 'handle_override_changeset_lock_request' ) );
+		add_action( 'wp_ajax_customize_override_changeset_lock', array( $this, 'handle_override_changeset_lock_request' ) );
 		add_action( 'wp_ajax_customize_dismiss_autosave_or_lock', array( $this, 'handle_dismiss_autosave_or_lock_request' ) );
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
+		add_action( 'customize_register', array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
+		add_action( 'customize_register', array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
+		add_action( 'customize_controls_init', array( $this, 'prepare_controls' ) );
 		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
 		// Render Common, Panel, Section, and Control templates.
 		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_panel_templates' ), 1 );
 		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_section_templates' ), 1 );
 		// Export the settings to JS via the _wpCustomizeSettings variable.
 		add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_pane_settings' ), 1000 );
 		// Add theme update notices.
 		if ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) ) {
-			require_once ABSPATH . '/wp-admin/includes/update.php';
+			require_once ABSPATH . 'wp-admin/includes/update.php';
 			add_action( 'customize_controls_print_footer_scripts', 'wp_print_admin_notice_templates' );
 		}
 	}
 	/**
 			wp_print_scripts( array( 'customize-base' ) );
 			$settings = array(
 				'messengerArgs' => array(
 					'channel' => $this->messenger_channel,
-					'url' => wp_customize_url(),
+					'url'     => wp_customize_url(),
 				),
-				'error' => $ajax_message,
+				'error'         => $ajax_message,
 			);
 			?>
 			<script>
 			( function( api, settings ) {
 				var preview = new api.Messenger( settings.messengerArgs );
 				preview.send( 'iframe-loading-error', settings.error );
-			} )( wp.customize, <?php echo wp_json_encode( $settings ) ?> );
+			} )( wp.customize, <?php echo wp_json_encode( $settings ); ?> );
 			</script>
 			<?php
 			$message .= ob_get_clean();
 		}
 		if ( empty( $this->_changeset_uuid ) ) {
 			$changeset_uuid = null;
 			if ( ! $this->branching() && $this->is_theme_active() ) {
-				$unpublished_changeset_posts = $this->get_changeset_posts( array(
+				$unpublished_changeset_posts = $this->get_changeset_posts(
-					'post_status' => array_diff( get_post_stati(), array( 'auto-draft', 'publish', 'trash', 'inherit', 'private' ) ),
+					array(
-					'exclude_restore_dismissed' => false,
+						'post_status'               => array_diff( get_post_stati(), array( 'auto-draft', 'publish', 'trash', 'inherit', 'private' ) ),
-					'author' => 'any',
+						'exclude_restore_dismissed' => false,
-					'posts_per_page' => 1,
+						'author'                    => 'any',
-					'order' => 'DESC',
+						'posts_per_page'            => 1,
-					'orderby' => 'date',
+						'order'                     => 'DESC',
-				) );
+						'orderby'                   => 'date',
-				$unpublished_changeset_post = array_shift( $unpublished_changeset_posts );
+					)
+				);
+				$unpublished_changeset_post  = array_shift( $unpublished_changeset_posts );
 				if ( ! empty( $unpublished_changeset_post ) && wp_is_uuid( $unpublished_changeset_post->post_name ) ) {
 					$changeset_uuid = $unpublished_changeset_post->post_name;
 				}
 			}
 	 *
 	 * @param string $uuid Changeset UUID.
 	 * @return int|null Returns post ID on success and null on failure.
 	 */
 	public function find_changeset_post_id( $uuid ) {
-		$cache_group = 'customize_changeset_post';
+		$cache_group       = 'customize_changeset_post';
 		$changeset_post_id = wp_cache_get( $uuid, $cache_group );
 		if ( $changeset_post_id && 'customize_changeset' === get_post_type( $changeset_post_id ) ) {
 			return $changeset_post_id;
 		}
-		$changeset_post_query = new WP_Query( array(
+		$changeset_post_query = new WP_Query(
-			'post_type' => 'customize_changeset',
+			array(
-			'post_status' => get_post_stati(),
+				'post_type'              => 'customize_changeset',
-			'name' => $uuid,
+				'post_status'            => get_post_stati(),
-			'posts_per_page' => 1,
+				'name'                   => $uuid,
-			'no_found_rows' => true,
+				'posts_per_page'         => 1,
-			'cache_results' => true,
+				'no_found_rows'          => true,
-			'update_post_meta_cache' => false,
+				'cache_results'          => true,
-			'update_post_term_cache' => false,
+				'update_post_meta_cache' => false,
-			'lazy_load_term_meta' => false,
+				'update_post_term_cache' => false,
-		) );
+				'lazy_load_term_meta'    => false,
+			)
+		);
 		if ( ! empty( $changeset_post_query->posts ) ) {
 			// Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.
 			$changeset_post_id = $changeset_post_query->posts[0]->ID;
 			wp_cache_set( $uuid, $changeset_post_id, $cache_group );
 			return $changeset_post_id;
 	 * @return WP_Post[] Auto-draft changesets.
 	 */
 	protected function get_changeset_posts( $args = array() ) {
 		$default_args = array(
 			'exclude_restore_dismissed' => true,
-			'posts_per_page' => -1,
+			'posts_per_page'            => -1,
-			'post_type' => 'customize_changeset',
+			'post_type'                 => 'customize_changeset',
-			'post_status' => 'auto-draft',
+			'post_status'               => 'auto-draft',
-			'order' => 'DESC',
+			'order'                     => 'DESC',
-			'orderby' => 'date',
+			'orderby'                   => 'date',
-			'no_found_rows' => true,
+			'no_found_rows'             => true,
-			'cache_results' => true,
+			'cache_results'             => true,
-			'update_post_meta_cache' => false,
+			'update_post_meta_cache'    => false,
-			'update_post_term_cache' => false,
+			'update_post_term_cache'    => false,
-			'lazy_load_term_meta' => false,
+			'lazy_load_term_meta'       => false,
 		);
 		if ( get_current_user_id() ) {
 			$default_args['author'] = get_current_user_id();
 		}
 		$args = array_merge( $default_args, $args );
 		if ( ! empty( $args['exclude_restore_dismissed'] ) ) {
 			unset( $args['exclude_restore_dismissed'] );
 			$args['meta_query'] = array(
 				array(
-					'key' => '_customize_restore_dismissed',
+					'key'     => '_customize_restore_dismissed',
 					'compare' => 'NOT EXISTS',
 				),
 			);
 		}
 	 *
 	 * @since 4.9.0
 	 * @return int The number of auto-drafts that were dismissed.
 	 */
 	protected function dismiss_user_auto_draft_changesets() {
-		$changeset_autodraft_posts = $this->get_changeset_posts( array(
+		$changeset_autodraft_posts = $this->get_changeset_posts(
-			'post_status' => 'auto-draft',
+			array(
-			'exclude_restore_dismissed' => true,
+				'post_status'               => 'auto-draft',
-			'posts_per_page' => -1,
+				'exclude_restore_dismissed' => true,
-		) );
+				'posts_per_page'            => -1,
-		$dismissed = 0;
+			)
+		);
+		$dismissed                 = 0;
 		foreach ( $changeset_autodraft_posts as $autosave_autodraft_post ) {
 			if ( $autosave_autodraft_post->ID === $this->changeset_post_id() ) {
 				continue;
 			}
 			if ( update_post_meta( $autosave_autodraft_post->ID, '_customize_restore_dismissed', true ) ) {
 			$changeset_data = $this->get_changeset_post_data( $this->changeset_post_id() );
 		}
 		$sidebars_widgets = isset( $starter_content['widgets'] ) && ! empty( $this->widgets ) ? $starter_content['widgets'] : array();
-		$attachments = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array();
+		$attachments      = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array();
-		$posts = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array();
+		$posts            = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array();
-		$options = isset( $starter_content['options'] ) ? $starter_content['options'] : array();
+		$options          = isset( $starter_content['options'] ) ? $starter_content['options'] : array();
-		$nav_menus = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array();
+		$nav_menus        = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array();
-		$theme_mods = isset( $starter_content['theme_mods'] ) ? $starter_content['theme_mods'] : array();
+		$theme_mods       = isset( $starter_content['theme_mods'] ) ? $starter_content['theme_mods'] : array();
 		// Widgets.
 		$max_widget_numbers = array();
 		foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
 			$sidebar_widget_ids = array();
 					}
 					// Find the max widget number for this type.
 					$widget_numbers = array_keys( $settings );
 					if ( count( $widget_numbers ) > 0 ) {
-						$widget_numbers[] = 1;
+						$widget_numbers[]               = 1;
 						$max_widget_numbers[ $id_base ] = call_user_func_array( 'max', $widget_numbers );
 					} else {
 						$max_widget_numbers[ $id_base ] = 1;
 					}
 				}
 				$max_widget_numbers[ $id_base ] += 1;
-				$widget_id = sprintf( '%s-%d', $id_base, $max_widget_numbers[ $id_base ] );
+				$widget_id  = sprintf( '%s-%d', $id_base, $max_widget_numbers[ $id_base ] );
 				$setting_id = sprintf( 'widget_%s[%d]', $id_base, $max_widget_numbers[ $id_base ] );
 				$setting_value = $this->widgets->sanitize_widget_js_instance( $instance );
 				if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
 					$this->set_post_value( $setting_id, $setting_value );
 			$starter_content_auto_draft_post_ids = array_merge( $starter_content_auto_draft_post_ids, $changeset_data['nav_menus_created_posts']['value'] );
 		}
 		// Make an index of all the posts needed and what their slugs are.
 		$needed_posts = array();
-		$attachments = $this->prepare_starter_content_attachments( $attachments );
+		$attachments  = $this->prepare_starter_content_attachments( $attachments );
 		foreach ( $attachments as $attachment ) {
-			$key = 'attachment:' . $attachment['post_name'];
+			$key                  = 'attachment:' . $attachment['post_name'];
 			$needed_posts[ $key ] = true;
 		}
 		foreach ( array_keys( $posts ) as $post_symbol ) {
 			if ( empty( $posts[ $post_symbol ]['post_name'] ) && empty( $posts[ $post_symbol ]['post_title'] ) ) {
 				unset( $posts[ $post_symbol ] );
 		$post_types = array_filter( array_merge( array( 'attachment' ), wp_list_pluck( $posts, 'post_type' ) ) );
 		// Re-use auto-draft starter content posts referenced in the current customized state.
 		$existing_starter_content_posts = array();
 		if ( ! empty( $starter_content_auto_draft_post_ids ) ) {
-			$existing_posts_query = new WP_Query( array(
+			$existing_posts_query = new WP_Query(
-				'post__in' => $starter_content_auto_draft_post_ids,
+				array(
-				'post_status' => 'auto-draft',
+					'post__in'       => $starter_content_auto_draft_post_ids,
-				'post_type' => $post_types,
+					'post_status'    => 'auto-draft',
-				'posts_per_page' => -1,
+					'post_type'      => $post_types,
-			) );
+					'posts_per_page' => -1,
+				)
+			);
 			foreach ( $existing_posts_query->posts as $existing_post ) {
 				$post_name = $existing_post->post_name;
 				if ( empty( $post_name ) ) {
 					$post_name = get_post_meta( $existing_post->ID, '_customize_draft_post_name', true );
 				}
 			}
 		}
 		// Re-use non-auto-draft posts.
 		if ( ! empty( $all_post_slugs ) ) {
-			$existing_posts_query = new WP_Query( array(
+			$existing_posts_query = new WP_Query(
-				'post_name__in' => $all_post_slugs,
+				array(
-				'post_status' => array_diff( get_post_stati(), array( 'auto-draft' ) ),
+					'post_name__in'  => $all_post_slugs,
-				'post_type' => 'any',
+					'post_status'    => array_diff( get_post_stati(), array( 'auto-draft' ) ),
-				'posts_per_page' => -1,
+					'post_type'      => 'any',
-			) );
+					'posts_per_page' => -1,
+				)
+			);
 			foreach ( $existing_posts_query->posts as $existing_post ) {
 				$key = $existing_post->post_type . ':' . $existing_post->post_name;
 				if ( isset( $needed_posts[ $key ] ) && ! isset( $existing_starter_content_posts[ $key ] ) ) {
 					$existing_starter_content_posts[ $key ] = $existing_post;
 				}
 		if ( ! empty( $attachments ) ) {
 			$attachment_ids = array();
 			foreach ( $attachments as $symbol => $attachment ) {
-				$file_array = array(
+				$file_array    = array(
 					'name' => $attachment['file_name'],
 				);
-				$file_path = $attachment['file_path'];
+				$file_path     = $attachment['file_path'];
 				$attachment_id = null;
 				$attached_file = null;
 				if ( isset( $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ] ) ) {
 					$attachment_post = $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ];
-					$attachment_id = $attachment_post->ID;
+					$attachment_id   = $attachment_post->ID;
-					$attached_file = get_attached_file( $attachment_id );
+					$attached_file   = get_attached_file( $attachment_id );
 					if ( empty( $attached_file ) || ! file_exists( $attached_file ) ) {
 						$attachment_id = null;
 						$attached_file = null;
 					} elseif ( $this->get_stylesheet() !== get_post_meta( $attachment_post->ID, '_starter_content_theme', true ) ) {
 				// Insert the attachment auto-draft because it doesn't yet exist or the attached file is gone.
 				if ( ! $attachment_id ) {
 					// Copy file to temp location so that original file won't get deleted from theme after sideloading.
-					$temp_file_name = wp_tempnam( basename( $file_path ) );
+					$temp_file_name = wp_tempnam( wp_basename( $file_path ) );
 					if ( $temp_file_name && copy( $file_path, $temp_file_name ) ) {
 						$file_array['tmp_name'] = $temp_file_name;
 					}
 					if ( empty( $file_array['tmp_name'] ) ) {
 						continue;
 			$this->set_post_value( $setting_id, array_unique( array_values( $starter_content_auto_draft_post_ids ) ) );
 			$this->pending_starter_content_settings_ids[] = $setting_id;
 		}
 		// Nav menus.
-		$placeholder_id = -1;
+		$placeholder_id              = -1;
 		$reused_nav_menu_setting_ids = array();
 		foreach ( $nav_menus as $nav_menu_location => $nav_menu ) {
-			$nav_menu_term_id = null;
+			$nav_menu_term_id    = null;
 			$nav_menu_setting_id = null;
-			$matches = array();
+			$matches             = array();
 			// Look for an existing placeholder menu with starter content to re-use.
 			foreach ( $changeset_data as $setting_id => $setting_params ) {
 				$can_reuse = (
 					! empty( $setting_params['starter_content'] )
 					! in_array( $setting_id, $reused_nav_menu_setting_ids, true )
 					&&
 					preg_match( '#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches )
 				);
 				if ( $can_reuse ) {
-					$nav_menu_term_id = intval( $matches['nav_menu_id'] );
+					$nav_menu_term_id              = intval( $matches['nav_menu_id'] );
-					$nav_menu_setting_id = $setting_id;
+					$nav_menu_setting_id           = $setting_id;
 					$reused_nav_menu_setting_ids[] = $setting_id;
 					break;
 				}
 			}
 			if ( ! $nav_menu_term_id ) {
 				while ( isset( $changeset_data[ sprintf( 'nav_menu[%d]', $placeholder_id ) ] ) ) {
 					$placeholder_id--;
 				}
-				$nav_menu_term_id = $placeholder_id;
+				$nav_menu_term_id    = $placeholder_id;
 				$nav_menu_setting_id = sprintf( 'nav_menu[%d]', $placeholder_id );
 			}
-			$this->set_post_value( $nav_menu_setting_id, array(
+			$this->set_post_value(
-				'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
+				$nav_menu_setting_id,
-			) );
+				array(
+					'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
+				)
+			);
 			$this->pending_starter_content_settings_ids[] = $nav_menu_setting_id;
 			// @todo Add support for menu_item_parent.
 			$position = 0;
 			foreach ( $nav_menu['items'] as $nav_menu_item ) {
 				if ( isset( $nav_menu_item['object_id'] ) ) {
 					if ( 'post_type' === $nav_menu_item['type'] && preg_match( '/^{{(?P<symbol>.+)}}$/', $nav_menu_item['object_id'], $matches ) && isset( $posts[ $matches['symbol'] ] ) ) {
 						$nav_menu_item['object_id'] = $posts[ $matches['symbol'] ]['ID'];
 						if ( empty( $nav_menu_item['title'] ) ) {
-							$original_object = get_post( $nav_menu_item['object_id'] );
+							$original_object        = get_post( $nav_menu_item['object_id'] );
 							$nav_menu_item['title'] = $original_object->post_title;
 						}
 					} else {
 						continue;
 					}
 				}
 			}
 			// Handle header image as special case since setting has a legacy format.
 			if ( 'header_image' === $name ) {
-				$name = 'header_image_data';
+				$name     = 'header_image_data';
 				$metadata = wp_get_attachment_metadata( $value );
 				if ( empty( $metadata ) ) {
 					continue;
 				}
 				$value = array(
 					'attachment_id' => $value,
-					'url' => wp_get_attachment_url( $value ),
+					'url'           => wp_get_attachment_url( $value ),
-					'height' => $metadata['height'],
+					'height'        => $metadata['height'],
-					'width' => $metadata['width'],
+					'width'         => $metadata['width'],
 				);
 			} elseif ( 'background_image' === $name ) {
 				$value = wp_get_attachment_url( $value );
 			}
 			} elseif ( file_exists( get_template_directory() . '/' . $attachment['file'] ) ) {
 				$file_path = get_template_directory() . '/' . $attachment['file'];
 			} else {
 				continue;
 			}
-			$file_name = basename( $attachment['file'] );
+			$file_name = wp_basename( $attachment['file'] );
 			// Skip file types that are not recognized.
 			$checked_filetype = wp_check_filetype( $file_name );
 			if ( empty( $checked_filetype['type'] ) ) {
 				continue;
 				} else {
 					$attachment['post_name'] = sanitize_title( preg_replace( '/\.\w+$/', '', $file_name ) );
 				}
 			}
-			$attachment['file_name'] = $file_name;
+			$attachment['file_name']         = $file_name;
-			$attachment['file_path'] = $file_path;
+			$attachment['file_path']         = $file_path;
 			$prepared_attachments[ $symbol ] = $attachment;
 		}
 		return $prepared_attachments;
 	}
 		if ( empty( $this->pending_starter_content_settings_ids ) ) {
 			return;
 		}
-		$this->save_changeset_post( array(
+		$this->save_changeset_post(
-			'data' => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
+			array(
-			'starter_content' => true,
+				'data'            => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
-		) );
+				'starter_content' => true,
+			)
+		);
 		$this->saved_starter_content_changeset = true;
 		$this->pending_starter_content_settings_ids = array();
 	}
 	 * state was exclusively sourced from `$_POST['customized']`. Nevertheless,
 	 * the value returned will come from the current changeset post and from the
 	 * incoming post data.
 	 *
 	 * @since 4.1.1
-	 * @since 4.7.0 Added $args param and merging with changeset values and stashed theme mods.
+	 * @since 4.7.0 Added `$args` parameter and merging with changeset values and stashed theme mods.
 	 *
 	 * @param array $args {
 	 *     Args.
 	 *
 	 *     @type bool $exclude_changeset Whether the changeset values should also be excluded. Defaults to false.
 		$values = array();
 		// Let default values be from the stashed theme mods if doing a theme switch and if no changeset is present.
 		if ( ! $this->is_theme_active() ) {
 			$stashed_theme_mods = get_option( 'customize_stashed_theme_mods' );
-			$stylesheet = $this->get_stylesheet();
+			$stylesheet         = $this->get_stylesheet();
 			if ( isset( $stashed_theme_mods[ $stylesheet ] ) ) {
 				$values = array_merge( $values, wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' ) );
 			}
 		}
 	 *
 	 * @param array $headers Headers.
 	 * @return array Headers.
 	 */
 	public function filter_iframe_security_headers( $headers ) {
-		$customize_url = admin_url( 'customize.php' );
+		$headers['X-Frame-Options']         = 'SAMEORIGIN';
-		$headers['X-Frame-Options'] = 'ALLOW-FROM ' . $customize_url;
+		$headers['Content-Security-Policy'] = "frame-ancestors 'self'";
-		$headers['Content-Security-Policy'] = 'frame-ancestors ' . preg_replace( '#^(\w+://[^/]+).+?$#', '$1', $customize_url );
 		return $headers;
 	}
 	/**
 	 * Add customize state query params to a given URL if preview is allowed.
 	 * @param string $url URL.
 	 * @return string URL.
 	 */
 	public function add_state_query_params( $url ) {
 		$parsed_original_url = wp_parse_url( $url );
-		$is_allowed = false;
+		$is_allowed          = false;
 		foreach ( $this->get_allowed_urls() as $allowed_url ) {
 			$parsed_allowed_url = wp_parse_url( $allowed_url );
-			$is_allowed = (
+			$is_allowed         = (
 				$parsed_allowed_url['scheme'] === $parsed_original_url['scheme']
 				&&
 				$parsed_allowed_url['host'] === $parsed_original_url['host']
 				&&
 				0 === strpos( $parsed_original_url['path'], $parsed_allowed_url['path'] )
 	 * Print CSS for loading indicators for the Customizer preview.
 	 *
 	 * @since 4.2.0
 	 */
 	public function customize_preview_loading_style() {
-		?><style>
+		?>
+		<style>
 			body.wp-customizer-unloading {
 				opacity: 0.25;
 				cursor: progress !important;
 				-webkit-transition: opacity 0.5s;
 				transition: opacity 0.5s;
 			form.customize-unpreviewable button,
 			a.customize-unpreviewable,
 			area.customize-unpreviewable {
 				cursor: not-allowed !important;
 			}
-		</style><?php
+		</style>
+		<?php
 	}
 	/**
 	 * Remove customize_messenger_channel query parameter from the preview window when it is not in an iframe.
 	 *
 	 * Print JavaScript settings for preview frame.
 	 *
 	 * @since 3.4.0
 	 */
 	public function customize_preview_settings() {
-		$post_values = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
+		$post_values                 = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
-		$setting_validities = $this->validate_setting_values( $post_values );
+		$setting_validities          = $this->validate_setting_values( $post_values );
 		$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
 		// Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installations.
-		$self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$self_url           = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
 		$state_query_params = array(
 			'customize_theme',
 			'customize_changeset_uuid',
 			'customize_messenger_channel',
 		);
-		$self_url = remove_query_arg( $state_query_params, $self_url );
+		$self_url           = remove_query_arg( $state_query_params, $self_url );
-		$allowed_urls = $this->get_allowed_urls();
+		$allowed_urls  = $this->get_allowed_urls();
 		$allowed_hosts = array();
 		foreach ( $allowed_urls as $allowed_url ) {
 			$parsed = wp_parse_url( $allowed_url );
 			if ( empty( $parsed['host'] ) ) {
 				continue;
 			}
 			$allowed_hosts[] = $host;
 		}
 		$switched_locale = switch_to_locale( get_user_locale() );
-		$l10n = array(
+		$l10n            = array(
-			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+			'shiftClickToEdit'  => __( 'Shift-click to edit this element.' ),
 			'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
 			'formUnpreviewable' => __( 'This form is not live-previewable.' ),
 		);
 		if ( $switched_locale ) {
 			restore_previous_locale();
 		}
 		$settings = array(
-			'changeset' => array(
+			'changeset'         => array(
-				'uuid' => $this->changeset_uuid(),
+				'uuid'      => $this->changeset_uuid(),
 				'autosaved' => $this->autosaved(),
 			),
-			'timeouts' => array(
+			'timeouts'          => array(
 				'selectiveRefresh' => 250,
-				'keepAliveSend' => 1000,
+				'keepAliveSend'    => 1000,
 			),
-			'theme' => array(
+			'theme'             => array(
 				'stylesheet' => $this->get_stylesheet(),
 				'active'     => $this->is_theme_active(),
 			),
-			'url' => array(
+			'url'               => array(
-				'self' => $self_url,
+				'self'          => $self_url,
-				'allowed' => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
+				'allowed'       => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
-				'allowedHosts' => array_unique( $allowed_hosts ),
+				'allowedHosts'  => array_unique( $allowed_hosts ),
 				'isCrossDomain' => $this->is_cross_domain(),
 			),
-			'channel' => $this->messenger_channel,
+			'channel'           => $this->messenger_channel,
-			'activePanels' => array(),
+			'activePanels'      => array(),
-			'activeSections' => array(),
+			'activeSections'    => array(),
-			'activeControls' => array(),
+			'activeControls'    => array(),
 			'settingValidities' => $exported_setting_validities,
-			'nonce' => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
+			'nonce'             => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
-			'l10n' => $l10n,
+			'l10n'              => $l10n,
-			'_dirty' => array_keys( $post_values ),
+			'_dirty'            => array_keys( $post_values ),
 		);
 		foreach ( $this->panels as $panel_id => $panel ) {
 			if ( $panel->check_capabilities() ) {
 				$settings['activePanels'][ $panel_id ] = $panel->active();
 	 *
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
 	public function current_theme( $current_theme ) {
-		return $this->theme()->display('Name');
+		return $this->theme()->display( 'Name' );
 	}
 	/**
 	 * Validates setting values.
 	 *
 	 *     @type bool $validate_capability Whether the setting capability will be checked.
 	 * }
 	 * @return array Mapping of setting IDs to return value of validate method calls, either `true` or `WP_Error`.
 	 */
 	public function validate_setting_values( $setting_values, $options = array() ) {
-		$options = wp_parse_args( $options, array(
+		$options = wp_parse_args(
-			'validate_capability' => false,
+			$options,
-			'validate_existence' => false,
+			array(
-		) );
+				'validate_capability' => false,
+				'validate_existence'  => false,
+			)
+		);
 		$validities = array();
 		foreach ( $setting_values as $setting_id => $unsanitized_value ) {
 			$setting = $this->get_setting( $setting_id );
 			if ( ! $setting ) {
 				$validity = $setting->validate( $unsanitized_value );
 			}
 			if ( ! is_wp_error( $validity ) ) {
 				/** This filter is documented in wp-includes/class-wp-customize-setting.php */
 				$late_validity = apply_filters( "customize_validate_{$setting->id}", new WP_Error(), $unsanitized_value, $setting );
-				if ( ! empty( $late_validity->errors ) ) {
+				if ( is_wp_error( $late_validity ) && $late_validity->has_errors() ) {
 					$validity = $late_validity;
 				}
 			}
 			if ( ! is_wp_error( $validity ) ) {
 				$value = $setting->sanitize( $unsanitized_value );
 		if ( is_wp_error( $validity ) ) {
 			$notification = array();
 			foreach ( $validity->errors as $error_code => $error_messages ) {
 				$notification[ $error_code ] = array(
 					'message' => join( ' ', $error_messages ),
-					'data' => $validity->get_error_data( $error_code ),
+					'data'    => $validity->get_error_data( $error_code ),
 				);
 			}
 			return $notification;
 		} else {
 			return true;
 		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
 			wp_send_json_error( 'invalid_nonce' );
 		}
 		$changeset_post_id = $this->changeset_post_id();
-		$is_new_changeset = empty( $changeset_post_id );
+		$is_new_changeset  = empty( $changeset_post_id );
 		if ( $is_new_changeset ) {
 			if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->create_posts ) ) {
 				wp_send_json_error( 'cannot_create_changeset_post' );
 			}
 		} else {
 		if ( isset( $_POST['customize_changeset_title'] ) ) {
 			$changeset_title = sanitize_text_field( wp_unslash( $_POST['customize_changeset_title'] ) );
 		}
 		// Validate changeset status param.
-		$is_publish = null;
+		$is_publish       = null;
 		$changeset_status = null;
 		if ( isset( $_POST['customize_changeset_status'] ) ) {
 			$changeset_status = wp_unslash( $_POST['customize_changeset_status'] );
 			if ( ! get_post_status_object( $changeset_status ) || ! in_array( $changeset_status, array( 'draft', 'pending', 'publish', 'future' ), true ) ) {
 				wp_send_json_error( 'bad_customize_changeset_status', 400 );
 		 */
 		$changeset_date_gmt = null;
 		if ( isset( $_POST['customize_changeset_date'] ) ) {
 			$changeset_date = wp_unslash( $_POST['customize_changeset_date'] );
 			if ( preg_match( '/^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$/', $changeset_date ) ) {
-				$mm = substr( $changeset_date, 5, 2 );
+				$mm         = substr( $changeset_date, 5, 2 );
-				$jj = substr( $changeset_date, 8, 2 );
+				$jj         = substr( $changeset_date, 8, 2 );
-				$aa = substr( $changeset_date, 0, 4 );
+				$aa         = substr( $changeset_date, 0, 4 );
 				$valid_date = wp_checkdate( $mm, $jj, $aa, $changeset_date );
 				if ( ! $valid_date ) {
 					wp_send_json_error( 'bad_customize_changeset_date', 400 );
 				}
 				$changeset_date_gmt = get_gmt_from_date( $changeset_date );
 				$changeset_date_gmt = gmdate( 'Y-m-d H:i:s', $timestamp );
 			}
 		}
 		$lock_user_id = null;
-		$autosave = ! empty( $_POST['customize_changeset_autosave'] );
+		$autosave     = ! empty( $_POST['customize_changeset_autosave'] );
 		if ( ! $is_new_changeset ) {
 			$lock_user_id = wp_check_post_lock( $this->changeset_post_id() );
 		}
 		// Force request to autosave when changeset is locked.
 		if ( $lock_user_id && ! $autosave ) {
-			$autosave = true;
+			$autosave           = true;
-			$changeset_status = null;
+			$changeset_status   = null;
 			$changeset_date_gmt = null;
 		}
 		if ( $autosave && ! defined( 'DOING_AUTOSAVE' ) ) { // Back-compat.
 			define( 'DOING_AUTOSAVE', true );
 		}
 		$autosaved = false;
-		$r = $this->save_changeset_post( array(
+		$r         = $this->save_changeset_post(
-			'status' => $changeset_status,
+			array(
-			'title' => $changeset_title,
+				'status'   => $changeset_status,
-			'date_gmt' => $changeset_date_gmt,
+				'title'    => $changeset_title,
-			'data' => $input_changeset_data,
+				'date_gmt' => $changeset_date_gmt,
-			'autosave' => $autosave,
+				'data'     => $input_changeset_data,
-		) );
+				'autosave' => $autosave,
+			)
+		);
 		if ( $autosave && ! is_wp_error( $r ) ) {
 			$autosaved = true;
 		}
 		// If the changeset was locked and an autosave request wasn't itself an error, then now explicitly return with a failure.
 		}
 		if ( is_wp_error( $r ) ) {
 			$response = array(
 				'message' => $r->get_error_message(),
-				'code' => $r->get_error_code(),
+				'code'    => $r->get_error_code(),
 			);
 			if ( is_array( $r->get_error_data() ) ) {
 				$response = array_merge( $response, $r->get_error_data() );
 			} else {
 				$response['data'] = $r->get_error_data();
 			}
 		} else {
-			$response = $r;
+			$response       = $r;
 			$changeset_post = get_post( $this->changeset_post_id() );
 			// Dismiss all other auto-draft changeset posts for this user (they serve like autosave revisions), as there should only be one.
 			if ( $is_new_changeset ) {
 				$this->dismiss_user_auto_draft_changesets();
 	 */
 	function save_changeset_post( $args = array() ) {
 		$args = array_merge(
 			array(
-				'status' => null,
+				'status'          => null,
-				'title' => null,
+				'title'           => null,
-				'data' => array(),
+				'data'            => array(),
-				'date_gmt' => null,
+				'date_gmt'        => null,
-				'user_id' => get_current_user_id(),
+				'user_id'         => get_current_user_id(),
 				'starter_content' => false,
-				'autosave' => false,
+				'autosave'        => false,
 			),
 			$args
 		);
-		$changeset_post_id = $this->changeset_post_id();
+		$changeset_post_id       = $this->changeset_post_id();
 		$existing_changeset_data = array();
 		if ( $changeset_post_id ) {
 			$existing_status = get_post_status( $changeset_post_id );
 			if ( 'publish' === $existing_status || 'trash' === $existing_status ) {
 				return new WP_Error(
 			}
 		}
 		// The request was made via wp.customize.previewer.save().
 		$update_transactionally = (bool) $args['status'];
-		$allow_revision = (bool) $args['status'];
+		$allow_revision         = (bool) $args['status'];
 		// Amend post values with any supplied data.
 		foreach ( $args['data'] as $setting_id => $setting_params ) {
 			if ( is_array( $setting_params ) && array_key_exists( 'value', $setting_params ) ) {
 				$this->set_post_value( $setting_id, $setting_params['value'] ); // Add to post values so that they can be validated and sanitized.
 			}
 		}
 		// Note that in addition to post data, this will include any stashed theme mods.
-		$post_values = $this->unsanitized_post_values( array(
+		$post_values = $this->unsanitized_post_values(
-			'exclude_changeset' => true,
+			array(
-			'exclude_post_data' => false,
+				'exclude_changeset' => true,
-		) );
+				'exclude_post_data' => false,
+			)
+		);
 		$this->add_dynamic_settings( array_keys( $post_values ) ); // Ensure settings get created even if they lack an input value.
 		/*
 		 * Get list of IDs for settings that have values different from what is currently
 		 * saved in the changeset. By skipping any values that are already the same, the
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
 		do_action( 'customize_save_validation_before', $this );
 		// Validate settings.
-		$validated_values = array_merge(
+		$validated_values      = array_merge(
 			array_fill_keys( array_keys( $args['data'] ), null ), // Make sure existence/capability checks are done on value-less setting updates.
 			$post_values
 		);
-		$setting_validities = $this->validate_setting_values( $validated_values, array(
+		$setting_validities    = $this->validate_setting_values(
-			'validate_capability' => true,
+			$validated_values,
-			'validate_existence' => true,
+			array(
-		) );
+				'validate_capability' => true,
+				'validate_existence'  => true,
+			)
+		);
 		$invalid_setting_count = count( array_filter( $setting_validities, 'is_wp_error' ) );
 		/*
 		 * Short-circuit if there are invalid settings the update is transactional.
 		 * A changeset update is transactional when a status is supplied in the request.
 		 */
 		if ( $update_transactionally && $invalid_setting_count > 0 ) {
 			$response = array(
 				'setting_validities' => $setting_validities,
 				/* translators: %s: number of invalid settings */
-				'message' => sprintf( _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
+				'message'            => sprintf( _n( 'Unable to save due to %s invalid setting.', 'Unable to save due to %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
 			);
 			return new WP_Error( 'transaction_fail', '', $response );
 		}
 		// Obtain/merge data for changeset.
 		$original_changeset_data = $this->get_changeset_post_data( $changeset_post_id );
-		$data = $original_changeset_data;
+		$data                    = $original_changeset_data;
 		if ( is_wp_error( $data ) ) {
 			$data = array();
 		}
 		// Ensure that all post values are included in the changeset data.
 				}
 				$data[ $changeset_setting_id ] = array_merge(
 					$merged_setting_params,
 					array(
-						'type' => $setting->type,
+						'type'              => $setting->type,
-						'user_id' => $args['user_id'],
+						'user_id'           => $args['user_id'],
 						'date_modified_gmt' => current_time( 'mysql', true ),
 					)
 				);
 				// Clear starter_content flag in data if changeset is not explicitly being updated for starter content.
 				}
 			}
 		}
 		$filter_context = array(
-			'uuid' => $this->changeset_uuid(),
+			'uuid'          => $this->changeset_uuid(),
-			'title' => $args['title'],
+			'title'         => $args['title'],
-			'status' => $args['status'],
+			'status'        => $args['status'],
-			'date_gmt' => $args['date_gmt'],
+			'date_gmt'      => $args['date_gmt'],
-			'post_id' => $changeset_post_id,
+			'post_id'       => $changeset_post_id,
 			'previous_data' => is_wp_error( $original_changeset_data ) ? array() : $original_changeset_data,
-			'manager' => $this,
+			'manager'       => $this,
 		);
 		/**
 		 * Filters the settings' data that will be persisted into the changeset.
 		 *
 		$json_options = 0;
 		if ( defined( 'JSON_UNESCAPED_SLASHES' ) ) {
 			$json_options |= JSON_UNESCAPED_SLASHES; // Introduced in PHP 5.4. This is only to improve readability as slashes needn't be escaped in storage.
 		}
 		$json_options |= JSON_PRETTY_PRINT; // Also introduced in PHP 5.4, but WP defines constant for back compat. See WP Trac #30139.
-		$post_array = array(
+		$post_array    = array(
 			'post_content' => wp_json_encode( $data, $json_options ),
 		);
 		if ( $args['title'] ) {
 			$post_array['post_title'] = $args['title'];
 		}
 		if ( $changeset_post_id ) {
 			$post_array['ID'] = $changeset_post_id;
 		} else {
-			$post_array['post_type'] = 'customize_changeset';
+			$post_array['post_type']   = 'customize_changeset';
-			$post_array['post_name'] = $this->changeset_uuid();
+			$post_array['post_name']   = $this->changeset_uuid();
 			$post_array['post_status'] = 'auto-draft';
 		}
 		if ( $args['status'] ) {
 			$post_array['post_status'] = $args['status'];
 		}
 		// Reset post date to now if we are publishing, otherwise pass post_date_gmt and translate for post_date.
 		if ( 'publish' === $args['status'] ) {
 			$post_array['post_date_gmt'] = '0000-00-00 00:00:00';
-			$post_array['post_date'] = '0000-00-00 00:00:00';
+			$post_array['post_date']     = '0000-00-00 00:00:00';
 		} elseif ( $args['date_gmt'] ) {
 			$post_array['post_date_gmt'] = $args['date_gmt'];
-			$post_array['post_date'] = get_date_from_gmt( $args['date_gmt'] );
+			$post_array['post_date']     = get_date_from_gmt( $args['date_gmt'] );
 		} elseif ( $changeset_post_id && 'auto-draft' === get_post_status( $changeset_post_id ) ) {
 			/*
 			 * Keep bumping the date for the auto-draft whenever it is modified;
 			 * this extends its life, preserving it from garbage-collection via
 			 * wp_delete_auto_drafts().
 			 */
-			$post_array['post_date'] = current_time( 'mysql' );
+			$post_array['post_date']     = current_time( 'mysql' );
 			$post_array['post_date_gmt'] = '';
 		}
 		$this->store_changeset_revision = $allow_revision;
 		add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 );
-		// Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save().
+		/*
+		 * Update the changeset post. The publish_customize_changeset action
+		 * will cause the settings in the changeset to be saved via
+		 * WP_Customize_Setting::save().
+		 */
+		// Prevent content filters from corrupting JSON in post_content.
 		$has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) );
 		if ( $has_kses ) {
-			kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content.
+			kses_remove_filters();
+		}
+		$has_targeted_link_rel_filters = ( false !== has_filter( 'content_save_pre', 'wp_targeted_link_rel' ) );
+		if ( $has_targeted_link_rel_filters ) {
+			wp_remove_targeted_link_rel_filters();
 		}
 		// Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values().
 		if ( $changeset_post_id ) {
 			if ( $args['autosave'] && 'auto-draft' !== get_post_status( $changeset_post_id ) ) {
 				// See _wp_translate_postdata() for why this is required as it will use the edit_post meta capability.
 				add_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10, 4 );
-				$post_array['post_ID'] = $post_array['ID'];
+				$post_array['post_ID']   = $post_array['ID'];
 				$post_array['post_type'] = 'customize_changeset';
-				$r = wp_create_post_autosave( wp_slash( $post_array ) );
+				$r                       = wp_create_post_autosave( wp_slash( $post_array ) );
 				remove_filter( 'map_meta_cap', array( $this, 'grant_edit_post_capability_for_changeset' ), 10 );
 			} else {
 				$post_array['edit_date'] = true; // Prevent date clearing.
-				$r = wp_update_post( wp_slash( $post_array ), true );
+				$r                       = wp_update_post( wp_slash( $post_array ), true );
 				// Delete autosave revision for user when the changeset is updated.
 				if ( ! empty( $args['user_id'] ) ) {
 					$autosave_draft = wp_get_post_autosave( $changeset_post_id, $args['user_id'] );
 					if ( $autosave_draft ) {
 			$r = wp_insert_post( wp_slash( $post_array ), true );
 			if ( ! is_wp_error( $r ) ) {
 				$this->_changeset_post_id = $r; // Update cached post ID for the loaded changeset.
 			}
 		}
+		// Restore removed content filters.
 		if ( $has_kses ) {
 			kses_init_filters();
 		}
+		if ( $has_targeted_link_rel_filters ) {
+			wp_init_targeted_link_rel_filters();
+		}
 		$this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents.
 		remove_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ) );
 		$response = array(
 		$post->post_status = $new_status;
 		wp_transition_post_status( $new_status, $old_status, $post );
 		/** This action is documented in wp-includes/post.php */
+		do_action( "edit_post_{$post->post_type}", $post->ID, $post );
+		/** This action is documented in wp-includes/post.php */
 		do_action( 'edit_post', $post->ID, $post );
 		/** This action is documented in wp-includes/post.php */
 		do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
 		if ( ! $this->is_preview() ) {
 			wp_send_json_error( 'not_preview' );
 		}
 		if ( ! check_ajax_referer( 'trash_customize_changeset', 'nonce', false ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'invalid_nonce',
+				array(
-				'message' => __( 'There was an authentication problem. Please reload and try again.' ),
+					'code'    => 'invalid_nonce',
-			) );
+					'message' => __( 'There was an authentication problem. Please reload and try again.' ),
+				)
+			);
 		}
 		$changeset_post_id = $this->changeset_post_id();
 		if ( ! $changeset_post_id ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'message' => __( 'No changes saved yet, so there is nothing to trash.' ),
+				array(
-				'code' => 'non_existent_changeset',
+					'message' => __( 'No changes saved yet, so there is nothing to trash.' ),
-			) );
+					'code'    => 'non_existent_changeset',
+				)
+			);
 			return;
 		}
 		if ( $changeset_post_id && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->delete_post, $changeset_post_id ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'changeset_trash_unauthorized',
+				array(
-				'message' => __( 'Unable to trash changes.' ),
+					'code'    => 'changeset_trash_unauthorized',
-			) );
+					'message' => __( 'Unable to trash changes.' ),
+				)
+			);
 		}
 		if ( 'trash' === get_post_status( $changeset_post_id ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'message' => __( 'Changes have already been trashed.' ),
+				array(
-				'code' => 'changeset_already_trashed',
+					'message' => __( 'Changes have already been trashed.' ),
-			) );
+					'code'    => 'changeset_already_trashed',
+				)
+			);
 			return;
 		}
 		$r = $this->trash_changeset_post( $changeset_post_id );
 		if ( ! ( $r instanceof WP_Post ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'changeset_trash_failure',
+				array(
-				'message' => __( 'Unable to trash changes.' ),
+					'code'    => 'changeset_trash_failure',
-			) );
+					'message' => __( 'Unable to trash changes.' ),
-		}
+				)
+			);
-		wp_send_json_success( array(
+		}
-			'message' => __( 'Changes trashed successfully.' ),
-		) );
+		wp_send_json_success(
+			array(
+				'message' => __( 'Changes trashed successfully.' ),
+			)
+		);
 	}
 	/**
 	 * Re-map 'edit_post' meta cap for a customize_changeset post to be the same as 'customize' maps.
 	 *
 	 * @since 4.9.0
 	 * @link https://core.trac.wordpress.org/ticket/40922
 	 * @see WP_Customize_Manager::save_changeset_post()
 	 * @see _wp_translate_postdata()
 	 *
-	 * @param array  $caps    Returns the user's actual capabilities.
+	 * @param string[] $caps    Array of the user's capabilities.
-	 * @param string $cap     Capability name.
+	 * @param string   $cap     Capability name.
-	 * @param int    $user_id The user ID.
+	 * @param int      $user_id The user ID.
-	 * @param array  $args    Adds the context to the cap. Typically the object ID.
+	 * @param array    $args    Adds the context to the cap. Typically the object ID.
-	 * @return array Capabilities.
+	 * @return array   Capabilities.
 	 */
 	public function grant_edit_post_capability_for_changeset( $caps, $cap, $user_id, $args ) {
 		if ( 'edit_post' === $cap && ! empty( $args[0] ) && 'customize_changeset' === get_post_type( $args[0] ) ) {
 			$post_type_obj = get_post_type_object( 'customize_changeset' );
-			$caps = map_meta_cap( $post_type_obj->cap->$cap, $user_id );
+			$caps          = map_meta_cap( $post_type_obj->cap->$cap, $user_id );
 		}
 		return $caps;
 	}
 	/**
 		}
 		$lock = get_post_meta( $changeset_post_id, '_edit_lock', true );
 		$lock = explode( ':', $lock );
 		if ( $lock && ! empty( $lock[1] ) ) {
-			$user_id = intval( $lock[1] );
+			$user_id         = intval( $lock[1] );
 			$current_user_id = get_current_user_id();
 			if ( $user_id === $current_user_id ) {
 				$lock = sprintf( '%s:%s', time(), $user_id );
 				update_post_meta( $changeset_post_id, '_edit_lock', $lock );
 			}
 		$lock_user = get_userdata( $user_id );
 		if ( ! $lock_user ) {
 			return null;
 		}
 		return array(
-			'id' => $lock_user->ID,
+			'id'     => $lock_user->ID,
-			'name' => $lock_user->display_name,
+			'name'   => $lock_user->display_name,
 			'avatar' => get_avatar_url( $lock_user->ID, array( 'size' => 128 ) ),
 		);
 	}
 	/**
 		if ( ! $this->is_preview() ) {
 			wp_send_json_error( 'not_preview', 400 );
 		}
 		if ( ! check_ajax_referer( 'customize_override_changeset_lock', 'nonce', false ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'invalid_nonce',
+				array(
-				'message' => __( 'Security check failed.' ),
+					'code'    => 'invalid_nonce',
-			) );
+					'message' => __( 'Security check failed.' ),
+				)
+			);
 		}
 		$changeset_post_id = $this->changeset_post_id();
 		if ( empty( $changeset_post_id ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'no_changeset_found_to_take_over',
+				array(
-				'message' => __( 'No changeset found to take over' ),
+					'code'    => 'no_changeset_found_to_take_over',
-			) );
+					'message' => __( 'No changeset found to take over' ),
+				)
+			);
 		}
 		if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post_id ) ) {
-			wp_send_json_error( array(
+			wp_send_json_error(
-				'code' => 'cannot_remove_changeset_lock',
+				array(
-				'message' => __( 'Sorry, you are not allowed to take over.' ),
+					'code'    => 'cannot_remove_changeset_lock',
-			) );
+					'message' => __( 'Sorry, you are not allowed to take over.' ),
+				)
+			);
 		}
 		$this->set_changeset_lock( $changeset_post_id, true );
 		wp_send_json_success( 'changeset_taken_over' );
 		$this->_changeset_uuid      = $changeset_post->post_name;
 		$previous_changeset_data    = $this->_changeset_data;
 		$this->_changeset_data      = $publishing_changeset_data;
 		// Parse changeset data to identify theme mod settings and user IDs associated with settings to be saved.
-		$setting_user_ids = array();
+		$setting_user_ids   = array();
 		$theme_mod_settings = array();
-		$namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
+		$namespace_pattern  = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
-		$matches = array();
+		$matches            = array();
 		foreach ( $this->_changeset_data as $raw_setting_id => $setting_params ) {
-			$actual_setting_id = null;
+			$actual_setting_id    = null;
 			$is_theme_mod_setting = (
 				isset( $setting_params['value'] )
 				&&
 				isset( $setting_params['type'] )
 				&&
 			if ( $actual_setting_id && isset( $setting_params['user_id'] ) ) {
 				$setting_user_ids[ $actual_setting_id ] = $setting_params['user_id'];
 			}
 		}
-		$changeset_setting_values = $this->unsanitized_post_values( array(
+		$changeset_setting_values = $this->unsanitized_post_values(
-			'exclude_post_data' => true,
+			array(
-			'exclude_changeset' => false,
+				'exclude_post_data' => true,
-		) );
+				'exclude_changeset' => false,
-		$changeset_setting_ids = array_keys( $changeset_setting_values );
+			)
+		);
+		$changeset_setting_ids    = array_keys( $changeset_setting_values );
 		$this->add_dynamic_settings( $changeset_setting_ids );
 		/**
 		 * Fires once the theme has switched in the Customizer, but before settings
 		 * have been saved.
 		$original_setting_capabilities = array();
 		foreach ( $changeset_setting_ids as $setting_id ) {
 			$setting = $this->get_setting( $setting_id );
 			if ( $setting && ! isset( $setting_user_ids[ $setting_id ] ) ) {
 				$original_setting_capabilities[ $setting->id ] = $setting->capability;
-				$setting->capability = 'exist';
+				$setting->capability                           = 'exist';
 			}
 		}
 		$original_user_id = get_current_user_id();
 		foreach ( $changeset_setting_ids as $setting_id ) {
 			if ( false !== strpos( $revision->post_name, "{$changeset_post_id}-autosave" ) ) {
 				$wpdb->update(
 					$wpdb->posts,
 					array(
 						'post_status' => 'auto-draft',
-						'post_type' => 'customize_changeset',
+						'post_type'   => 'customize_changeset',
-						'post_name' => wp_generate_uuid4(),
+						'post_name'   => wp_generate_uuid4(),
 						'post_parent' => 0,
 					),
 					array(
 						'ID' => $revision->ID,
 					)
 				$theme_mod_settings
 			);
 		}
 		$autoload = false;
-		$result = update_option( 'customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload );
+		$result   = update_option( 'customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload );
 		if ( ! $result ) {
 			return false;
 		}
 		return $stashed_theme_mod_settings;
 	}
 		if ( ! check_ajax_referer( 'customize_dismiss_autosave_or_lock', 'nonce', false ) ) {
 			wp_send_json_error( 'invalid_nonce', 403 );
 		}
 		$changeset_post_id = $this->changeset_post_id();
-		$dismiss_lock = ! empty( $_POST['dismiss_lock'] );
+		$dismiss_lock      = ! empty( $_POST['dismiss_lock'] );
-		$dismiss_autosave = ! empty( $_POST['dismiss_autosave'] );
+		$dismiss_autosave  = ! empty( $_POST['dismiss_autosave'] );
 		if ( $dismiss_lock ) {
 			if ( empty( $changeset_post_id ) && ! $dismiss_autosave ) {
 				wp_send_json_error( 'no_changeset_to_dismiss_lock', 404 );
 			}
 	 * @param WP_Customize_Setting|string $id   Customize Setting object, or ID.
 	 * @param array                       $args {
 	 *  Optional. Array of properties for the new WP_Customize_Setting. Default empty array.
 	 *
 	 *  @type string       $type                  Type of the setting. Default 'theme_mod'.
-	 *                                            Default 160.
 	 *  @type string       $capability            Capability required for the setting. Default 'edit_theme_options'
 	 *  @type string|array $theme_supports        Theme features required to support the panel. Default is none.
 	 *  @type string       $default               Default value for the setting. Default is empty string.
-	 *  @type string       $transport             Options for rendering the live preview of changes in Theme Customizer.
+	 *  @type string       $transport             Options for rendering the live preview of changes in Customizer.
 	 *                                            Using 'refresh' makes the change visible by reloading the whole preview.
 	 *                                            Using 'postMessage' allows a custom JavaScript to handle live changes.
-	 *                                            @link https://developer.wordpress.org/themes/customize-api
+	 * @link https://developer.wordpress.org/themes/customize-api
 	 *                                            Default is 'refresh'
 	 *  @type callable     $validate_callback     Server-side validation callback for the setting's value.
 	 *  @type callable     $sanitize_callback     Callback to filter a Customize setting value in un-slashed form.
 	 *  @type callable     $sanitize_js_callback  Callback to convert a Customize PHP setting value to a value that is
 	 *                                            JSON serializable.
 			// Skip settings already created
 			if ( $this->get_setting( $setting_id ) ) {
 				continue;
 			}
-			$setting_args = false;
+			$setting_args  = false;
 			$setting_class = 'WP_Customize_Setting';
 			/**
 			 * Filters a dynamic setting's constructor args.
 			 *
 	 */
 	public function remove_panel( $id ) {
 		// Removing core components this way is _doing_it_wrong().
 		if ( in_array( $id, $this->components, true ) ) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(
+				__( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
 				$id,
 				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
 			);
 			_doing_it_wrong( __METHOD__, $message, '4.5.0' );
 	 *
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
 	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
+		if ( isset( $this->sections[ $id ] ) ) {
 			return $this->sections[ $id ];
+		}
 	}
 	/**
 	 * Remove a customize section.
 	 *
 	 *
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
 	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
+		if ( isset( $this->controls[ $id ] ) ) {
 			return $this->controls[ $id ];
+		}
 	}
 	/**
 	 * Remove a customize control.
 	 *
 	 */
 	public function render_control_templates() {
 		if ( $this->branching() ) {
 			$l10n = array(
 				/* translators: %s: User who is customizing the changeset in customizer. */
-				'locked' => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
+				'locked'                => __( '%s is already customizing this changeset. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
 				/* translators: %s: User who is customizing the changeset in customizer. */
 				'locked_allow_override' => __( '%s is already customizing this changeset. Do you want to take over?' ),
 			);
 		} else {
 			$l10n = array(
 				/* translators: %s: User who is customizing the changeset in customizer. */
-				'locked' => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
+				'locked'                => __( '%s is already customizing this site. Please wait until they are done to try customizing. Your latest changes have been autosaved.' ),
 				/* translators: %s: User who is customizing the changeset in customizer. */
 				'locked_allow_override' => __( '%s is already customizing this site. Do you want to take over?' ),
 			);
 		}
 		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
+			$control = new $control_type(
-				'settings' => array(),
+				$this,
-			) );
+				'temp',
+				array(
+					'settings' => array(),
+				)
+			);
 			$control->print_template();
 		}
 		?>
 		<script type="text/html" id="tmpl-customize-control-default-content">
 			<div class="customize-control-notifications-container"></div>
 			<div class="preview-link-wrapper">
 				<label for="{{ elementPrefix }}customize-preview-link-input" class="screen-reader-text"><?php esc_html_e( 'Preview Link' ); ?></label>
 				<a href="" target="">
 					<span class="preview-control-element" data-component="url"></span>
-					<span class="screen-reader-text"><?php _e( '(opens in a new window)' ); ?></span>
+					<span class="screen-reader-text"><?php _e( '(opens in a new tab)' ); ?></span>
 				</a>
 				<input id="{{ elementPrefix }}customize-preview-link-input" readonly tabindex="-1" class="preview-control-element" data-component="input">
 				<button class="customize-copy-preview-link preview-control-element button button-secondary" data-component="button" data-copy-text="<?php esc_attr_e( 'Copy' ); ?>" data-copied-text="<?php esc_attr_e( 'Copied' ); ?>" ><?php esc_html_e( 'Copy' ); ?></button>
 			</div>
 		</script>
 	 *
 	 * @since 3.4.0
 	 */
 	public function prepare_controls() {
-		$controls = array();
+		$controls       = array();
-		$this->controls = wp_list_sort( $this->controls, array(
+		$this->controls = wp_list_sort(
-			'priority'        => 'ASC',
+			$this->controls,
-			'instance_number' => 'ASC',
+			array(
-		), 'ASC', true );
+				'priority'        => 'ASC',
+				'instance_number' => 'ASC',
+			),
+			'ASC',
+			true
+		);
 		foreach ( $this->controls as $id => $control ) {
 			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
 				continue;
 			}
 			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$controls[ $id ]                                 = $control;
 		}
 		$this->controls = $controls;
 		// Prepare sections.
-		$this->sections = wp_list_sort( $this->sections, array(
+		$this->sections = wp_list_sort(
-			'priority'        => 'ASC',
+			$this->sections,
-			'instance_number' => 'ASC',
+			array(
-		), 'ASC', true );
+				'priority'        => 'ASC',
-		$sections = array();
+				'instance_number' => 'ASC',
+			),
+			'ASC',
+			true
+		);
+		$sections       = array();
 		foreach ( $this->sections as $section ) {
 			if ( ! $section->check_capabilities() ) {
 				continue;
 			}
+			$section->controls = wp_list_sort(
-			$section->controls = wp_list_sort( $section->controls, array(
+				$section->controls,
-				'priority'        => 'ASC',
+				array(
-				'instance_number' => 'ASC',
+					'priority'        => 'ASC',
-			) );
+					'instance_number' => 'ASC',
+				)
+			);
 			if ( ! $section->panel ) {
 				// Top-level section.
 				$sections[ $section->id ] = $section;
 			} else {
 			}
 		}
 		$this->sections = $sections;
 		// Prepare panels.
-		$this->panels = wp_list_sort( $this->panels, array(
+		$this->panels = wp_list_sort(
-			'priority'        => 'ASC',
+			$this->panels,
-			'instance_number' => 'ASC',
+			array(
-		), 'ASC', true );
+				'priority'        => 'ASC',
-		$panels = array();
+				'instance_number' => 'ASC',
+			),
+			'ASC',
+			true
+		);
+		$panels       = array();
 		foreach ( $this->panels as $panel ) {
 			if ( ! $panel->check_capabilities() ) {
 				continue;
 			}
-			$panel->sections = wp_list_sort( $panel->sections, array(
+			$panel->sections      = wp_list_sort(
+				$panel->sections,
+				array(
+					'priority'        => 'ASC',
+					'instance_number' => 'ASC',
+				),
+				'ASC',
+				true
+			);
+			$panels[ $panel->id ] = $panel;
+		}
+		$this->panels = $panels;
+		// Sort panels and top-level sections together.
+		$this->containers = array_merge( $this->panels, $this->sections );
+		$this->containers = wp_list_sort(
+			$this->containers,
+			array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true );
+			),
-			$panels[ $panel->id ] = $panel;
+			'ASC',
-		}
+			true
-		$this->panels = $panels;
+		);
-		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		$this->containers = wp_list_sort( $this->containers, array(
-			'priority'        => 'ASC',
-			'instance_number' => 'ASC',
-		), 'ASC', true );
 	}
 	/**
 	 * Enqueue scripts for customize controls.
 	 *
 			$control->enqueue();
 		}
 		if ( ! is_multisite() && ( current_user_can( 'install_themes' ) || current_user_can( 'update_themes' ) || current_user_can( 'delete_themes' ) ) ) {
 			wp_enqueue_script( 'updates' );
-			wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+			wp_localize_script(
-				'totals' => wp_get_update_data(),
+				'updates',
-			) );
+				'_wpUpdatesItemCounts',
+				array(
+					'totals' => wp_get_update_data(),
+				)
+			);
 		}
 	}
 	/**
 	 * Determine whether the user agent is iOS.
 	 * @since 4.4.0
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
 	public function set_preview_url( $preview_url ) {
-		$preview_url = esc_url_raw( $preview_url );
+		$preview_url       = esc_url_raw( $preview_url );
 		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
 	}
 	/**
 	 * Get the initial URL to be previewed.
 	 *
 	 * @return bool Whether cross-domain.
 	 */
 	public function is_cross_domain() {
 		$admin_origin = wp_parse_url( admin_url() );
-		$home_origin = wp_parse_url( home_url() );
+		$home_origin  = wp_parse_url( home_url() );
 		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
 		return $cross_domain;
 	}
 	/**
 		/**
 		 * Filters the list of URLs allowed to be clicked and followed in the Customizer preview.
 		 *
 		 * @since 3.4.0
 		 *
-		 * @param array $allowed_urls An array of allowed URLs.
+		 * @param string[] $allowed_urls An array of allowed URLs.
 		 */
 		$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
 		return $allowed_urls;
 	}
 	 * @since 4.4.0
 	 *
 	 * @param string $return_url URL for return link.
 	 */
 	public function set_return_url( $return_url ) {
-		$return_url = esc_url_raw( $return_url );
+		$return_url       = esc_url_raw( $return_url );
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
+		$return_url       = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+		$return_url       = wp_validate_redirect( $return_url );
 		$this->return_url = $return_url;
 	}
 	/**
 	 * Get URL to link the user to when closing the Customizer.
 	 * @since 4.4.0
 	 *
 	 * @return string URL for link to close Customizer.
 	 */
 	public function get_return_url() {
-		$referer = wp_get_referer();
+		$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 && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} elseif ( $referer && ! in_array( wp_basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} elseif ( $this->preview_url ) {
 			$return_url = $this->preview_url;
 		} else {
 			$return_url = home_url( '/' );
 		}
 		return $return_url;
 	 *
 	 * @return array Nonces.
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
+			'save'                     => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'preview'                  => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
-			'switch_themes' => wp_create_nonce( 'switch_themes' ),
+			'switch_themes'            => wp_create_nonce( 'switch_themes' ),
 			'dismiss_autosave_or_lock' => wp_create_nonce( 'customize_dismiss_autosave_or_lock' ),
-			'override_lock' => wp_create_nonce( 'customize_override_changeset_lock' ),
+			'override_lock'            => wp_create_nonce( 'customize_override_changeset_lock' ),
-			'trash' => wp_create_nonce( 'trash_customize_changeset' ),
+			'trash'                    => wp_create_nonce( 'trash_customize_changeset' ),
 		);
 		/**
 		 * Filters nonces for Customizer.
 		 *
 		 * @since 4.2.0
 		 *
-		 * @param array                $nonces Array of refreshed nonces for save and
+		 * @param string[]             $nonces Array of refreshed nonces for save and
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
 		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
 	 *
 	 * @since 4.4.0
 	 */
 	public function customize_pane_settings() {
-		$login_url = add_query_arg( array(
+		$login_url = add_query_arg(
-			'interim-login' => 1,
+			array(
-			'customize-login' => 1,
+				'interim-login'   => 1,
-		), wp_login_url() );
+				'customize-login' => 1,
+			),
+			wp_login_url()
+		);
 		// Ensure dirty flags are set for modified settings.
 		foreach ( array_keys( $this->unsanitized_post_values() ) as $setting_id ) {
 			$setting = $this->get_setting( $setting_id );
 			if ( $setting ) {
 				$setting->dirty = true;
 			}
 		}
-		$autosave_revision_post = null;
+		$autosave_revision_post  = null;
 		$autosave_autodraft_post = null;
-		$changeset_post_id = $this->changeset_post_id();
+		$changeset_post_id       = $this->changeset_post_id();
 		if ( ! $this->saved_starter_content_changeset && ! $this->autosaved() ) {
 			if ( $changeset_post_id ) {
 				if ( is_user_logged_in() ) {
 					$autosave_revision_post = wp_get_post_autosave( $changeset_post_id, get_current_user_id() );
 				}
 			} else {
-				$autosave_autodraft_posts = $this->get_changeset_posts( array(
+				$autosave_autodraft_posts = $this->get_changeset_posts(
-					'posts_per_page' => 1,
+					array(
-					'post_status' => 'auto-draft',
+						'posts_per_page'            => 1,
-					'exclude_restore_dismissed' => true,
+						'post_status'               => 'auto-draft',
-				) );
+						'exclude_restore_dismissed' => true,
+					)
+				);
 				if ( ! empty( $autosave_autodraft_posts ) ) {
 					$autosave_autodraft_post = array_shift( $autosave_autodraft_posts );
 				}
 			}
 		}
 		// @todo Include all of the status labels here from script-loader.php, and then allow it to be filtered.
 		$status_choices = array();
 		if ( $current_user_can_publish ) {
 			$status_choices[] = array(
 				'status' => 'publish',
-				'label' => __( 'Publish' ),
+				'label'  => __( 'Publish' ),
 			);
 		}
 		$status_choices[] = array(
 			'status' => 'draft',
-			'label' => __( 'Save Draft' ),
+			'label'  => __( 'Save Draft' ),
 		);
 		if ( $current_user_can_publish ) {
 			$status_choices[] = array(
 				'status' => 'future',
-				'label' => _x( 'Schedule', 'customizer changeset action/button label' ),
+				'label'  => _x( 'Schedule', 'customizer changeset action/button label' ),
 			);
 		}
 		// Prepare Customizer settings to pass to JavaScript.
 		$changeset_post = null;
 		if ( $this->changeset_post_id() ) {
 			$lock_user_id = wp_check_post_lock( $this->changeset_post_id() );
 		}
 		$settings = array(
-			'changeset' => array(
+			'changeset'              => array(
-				'uuid' => $this->changeset_uuid(),
+				'uuid'                  => $this->changeset_uuid(),
-				'branching' => $this->branching(),
+				'branching'             => $this->branching(),
-				'autosaved' => $this->autosaved(),
+				'autosaved'             => $this->autosaved(),
-				'hasAutosaveRevision' => ! empty( $autosave_revision_post ),
+				'hasAutosaveRevision'   => ! empty( $autosave_revision_post ),
-				'latestAutoDraftUuid' => $autosave_autodraft_post ? $autosave_autodraft_post->post_name : null,
+				'latestAutoDraftUuid'   => $autosave_autodraft_post ? $autosave_autodraft_post->post_name : null,
-				'status' => $changeset_post ? $changeset_post->post_status : '',
+				'status'                => $changeset_post ? $changeset_post->post_status : '',
 				'currentUserCanPublish' => $current_user_can_publish,
-				'publishDate' => $initial_date,
+				'publishDate'           => $initial_date,
-				'statusChoices' => $status_choices,
+				'statusChoices'         => $status_choices,
-				'lockUser' => $lock_user_id ? $this->get_lock_user_data( $lock_user_id ) : null,
+				'lockUser'              => $lock_user_id ? $this->get_lock_user_data( $lock_user_id ) : null,
 			),
-			'initialServerDate' => $current_time,
+			'initialServerDate'      => $current_time,
-			'dateFormat' => get_option( 'date_format' ),
+			'dateFormat'             => get_option( 'date_format' ),
-			'timeFormat' => get_option( 'time_format' ),
+			'timeFormat'             => get_option( 'time_format' ),
 			'initialServerTimestamp' => floor( microtime( true ) * 1000 ),
 			'initialClientTimestamp' => -1, // To be set with JS below.
-			'timeouts' => array(
+			'timeouts'               => array(
-				'windowRefresh' => 250,
+				'windowRefresh'           => 250,
-				'changesetAutoSave' => AUTOSAVE_INTERVAL * 1000,
+				'changesetAutoSave'       => AUTOSAVE_INTERVAL * 1000,
-				'keepAliveCheck' => 2500,
+				'keepAliveCheck'          => 2500,
-				'reflowPaneContents' => 100,
+				'reflowPaneContents'      => 100,
 				'previewFrameSensitivity' => 2000,
 			),
-			'theme'    => array(
+			'theme'                  => array(
 				'stylesheet'  => $this->get_stylesheet(),
 				'active'      => $this->is_theme_active(),
 				'_canInstall' => current_user_can( 'install_themes' ),
 			),
-			'url'      => array(
+			'url'                    => array(
 				'preview'       => esc_url_raw( $this->get_preview_url() ),
 				'return'        => esc_url_raw( $this->get_return_url() ),
 				'parent'        => esc_url_raw( admin_url() ),
 				'activated'     => esc_url_raw( home_url( '/' ) ),
 				'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
 				'allowed'       => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
 				'isCrossDomain' => $this->is_cross_domain(),
 				'home'          => esc_url_raw( home_url( '/' ) ),
 				'login'         => esc_url_raw( $login_url ),
 			),
-			'browser'  => array(
+			'browser'                => array(
 				'mobile' => wp_is_mobile(),
 				'ios'    => $this->is_ios(),
 			),
-			'panels'   => array(),
+			'panels'                 => array(),
-			'sections' => array(),
+			'sections'               => array(),
-			'nonce'    => $this->get_nonces(),
+			'nonce'                  => $this->get_nonces(),
-			'autofocus' => $this->get_autofocus(),
+			'autofocus'              => $this->get_autofocus(),
-			'documentTitleTmpl' => $this->get_document_title_template(),
+			'documentTitleTmpl'      => $this->get_document_title_template(),
-			'previewableDevices' => $this->get_previewable_devices(),
+			'previewableDevices'     => $this->get_previewable_devices(),
-			'l10n' => array(
+			'l10n'                   => array(
-				'confirmDeleteTheme' => __( 'Are you sure you want to delete this theme?' ),
+				'confirmDeleteTheme'   => __( 'Are you sure you want to delete this theme?' ),
 				/* translators: %d: number of theme search results, which cannot currently consider singular vs. plural forms */
-				'themeSearchResults' => __( '%d themes found' ),
+				'themeSearchResults'   => __( '%d themes found' ),
 				/* translators: %d: number of themes being displayed, which cannot currently consider singular vs. plural forms */
-				'announceThemeCount' => __( 'Displaying %d themes' ),
+				'announceThemeCount'   => __( 'Displaying %d themes' ),
 				/* translators: %s: theme name */
 				'announceThemeDetails' => __( 'Showing details for theme: %s' ),
 			),
 		);
 						wp_json_encode( $control->json() )
 					);
 				}
 			}
 			echo "})( _wpCustomizeSettings.controls );\n";
-		?>
+			?>
 		</script>
 		<?php
 	}
 	/**
 	 * @return array List of devices with labels and default setting.
 	 */
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label'   => __( 'Enter desktop preview mode' ),
 				'default' => true,
 			),
-			'tablet' => array(
+			'tablet'  => array(
 				'label' => __( 'Enter tablet preview mode' ),
 			),
-			'mobile' => array(
+			'mobile'  => array(
 				'label' => __( 'Enter mobile preview mode' ),
 			),
 		);
 		/**
 	 */
 	public function register_controls() {
 		/* Themes (controls are loaded via ajax) */
-		$this->add_panel( new WP_Customize_Themes_Panel( $this, 'themes', array(
+		$this->add_panel(
-			'title'       => $this->theme()->display( 'Name' ),
+			new WP_Customize_Themes_Panel(
-			'description' => (
+				$this,
-				'<p>' . __( 'Looking for a theme? You can search or browse the WordPress.org theme directory, install and preview themes, then activate them right here.' ) . '</p>' .
+				'themes',
-				'<p>' . __( 'While previewing a new theme, you can continue to tailor things like widgets and menus, and explore theme-specific options.' ) . '</p>'
+				array(
-			),
+					'title'       => $this->theme()->display( 'Name' ),
-			'capability'  => 'switch_themes',
+					'description' => (
-			'priority'    => 0,
+					'<p>' . __( 'Looking for a theme? You can search or browse the WordPress.org theme directory, install and preview themes, then activate them right here.' ) . '</p>' .
-		) ) );
+					'<p>' . __( 'While previewing a new theme, you can continue to tailor things like widgets and menus, and explore theme-specific options.' ) . '</p>'
+					),
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'installed_themes', array(
+					'capability'  => 'switch_themes',
-			'title'       => __( 'Installed themes' ),
+					'priority'    => 0,
-			'action'      => 'installed',
+				)
-			'capability'  => 'switch_themes',
+			)
-			'panel'       => 'themes',
+		);
-			'priority'    => 0,
-		) ) );
+		$this->add_section(
+			new WP_Customize_Themes_Section(
+				$this,
+				'installed_themes',
+				array(
+					'title'      => __( 'Installed themes' ),
+					'action'     => 'installed',
+					'capability' => 'switch_themes',
+					'panel'      => 'themes',
+					'priority'   => 0,
+				)
+			)
+		);
 		if ( ! is_multisite() ) {
-			$this->add_section( new WP_Customize_Themes_Section( $this, 'wporg_themes', array(
+			$this->add_section(
-				'title'       => __( 'WordPress.org themes' ),
+				new WP_Customize_Themes_Section(
-				'action'      => 'wporg',
+					$this,
-				'filter_type' => 'remote',
+					'wporg_themes',
-				'capability'  => 'install_themes',
+					array(
-				'panel'       => 'themes',
+						'title'       => __( 'WordPress.org themes' ),
-				'priority'    => 5,
+						'action'      => 'wporg',
-			) ) );
+						'filter_type' => 'remote',
+						'capability'  => 'install_themes',
+						'panel'       => 'themes',
+						'priority'    => 5,
+					)
+				)
+			);
 		}
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(
-			'capability' => 'switch_themes',
+			new WP_Customize_Filter_Setting(
-		) ) );
+				$this,
+				'active_theme',
+				array(
+					'capability' => 'switch_themes',
+				)
+			)
+		);
 		/* Site Identity */
-		$this->add_section( 'title_tagline', array(
+		$this->add_section(
-			'title'    => __( 'Site Identity' ),
+			'title_tagline',
-			'priority' => 20,
+			array(
-		) );
+				'title'    => __( 'Site Identity' ),
+				'priority' => 20,
-		$this->add_setting( 'blogname', array(
+			)
-			'default'    => get_option( 'blogname' ),
+		);
-			'type'       => 'option',
-			'capability' => 'manage_options',
+		$this->add_setting(
-		) );
+			'blogname',
+			array(
-		$this->add_control( 'blogname', array(
+				'default'    => get_option( 'blogname' ),
-			'label'      => __( 'Site Title' ),
+				'type'       => 'option',
-			'section'    => 'title_tagline',
+				'capability' => 'manage_options',
-		) );
+			)
+		);
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_control(
-			'type'       => 'option',
+			'blogname',
-			'capability' => 'manage_options',
+			array(
-		) );
+				'label'   => __( 'Site Title' ),
+				'section' => 'title_tagline',
-		$this->add_control( 'blogdescription', array(
+			)
-			'label'      => __( 'Tagline' ),
+		);
-			'section'    => 'title_tagline',
-		) );
+		$this->add_setting(
+			'blogdescription',
+			array(
+				'default'    => get_option( 'blogdescription' ),
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
+		$this->add_control(
+			'blogdescription',
+			array(
+				'label'   => __( 'Tagline' ),
+				'section' => 'title_tagline',
+			)
+		);
 		// Add a setting to hide header text if the theme doesn't support custom headers.
 		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->add_setting( 'header_text', array(
+			$this->add_setting(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
+				'header_text',
-				'default'           => 1,
+				array(
-				'sanitize_callback' => 'absint',
+					'theme_supports'    => array( 'custom-logo', 'header-text' ),
-			) );
+					'default'           => 1,
+					'sanitize_callback' => 'absint',
-			$this->add_control( 'header_text', array(
+				)
+			);
+			$this->add_control(
+				'header_text',
+				array(
+					'label'    => __( 'Display Site Title and Tagline' ),
+					'section'  => 'title_tagline',
+					'settings' => 'header_text',
+					'type'     => 'checkbox',
+				)
+			);
+		}
+		$this->add_setting(
+			'site_icon',
+			array(
+				'type'       => 'option',
+				'capability' => 'manage_options',
+				'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
+			)
+		);
+		$this->add_control(
+			new WP_Customize_Site_Icon_Control(
+				$this,
+				'site_icon',
+				array(
+					'label'       => __( 'Site Icon' ),
+					'description' => sprintf(
+						'<p>' . __( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ) . '</p>' .
+						/* translators: %s: site icon size in pixels */
+						'<p>' . __( 'Site Icons should be square and at least %s pixels.' ) . '</p>',
+						'<strong>512 &times; 512</strong>'
+					),
+					'section'     => 'title_tagline',
+					'priority'    => 60,
+					'height'      => 512,
+					'width'       => 512,
+				)
+			)
+		);
+		$this->add_setting(
+			'custom_logo',
+			array(
+				'theme_supports' => array( 'custom-logo' ),
+				'transport'      => 'postMessage',
+			)
+		);
+		$custom_logo_args = get_theme_support( 'custom-logo' );
+		$this->add_control(
+			new WP_Customize_Cropped_Image_Control(
+				$this,
+				'custom_logo',
+				array(
+					'label'         => __( 'Logo' ),
+					'section'       => 'title_tagline',
+					'priority'      => 8,
+					'height'        => $custom_logo_args[0]['height'],
+					'width'         => $custom_logo_args[0]['width'],
+					'flex_height'   => $custom_logo_args[0]['flex-height'],
+					'flex_width'    => $custom_logo_args[0]['flex-width'],
+					'button_labels' => array(
+						'select'       => __( 'Select logo' ),
+						'change'       => __( 'Change logo' ),
+						'remove'       => __( 'Remove' ),
+						'default'      => __( 'Default' ),
+						'placeholder'  => __( 'No logo selected' ),
+						'frame_title'  => __( 'Select logo' ),
+						'frame_button' => __( 'Choose logo' ),
+					),
+				)
+			)
+		);
+		$this->selective_refresh->add_partial(
+			'custom_logo',
+			array(
+				'settings'            => array( 'custom_logo' ),
+				'selector'            => '.custom-logo-link',
+				'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+				'container_inclusive' => true,
+			)
+		);
+		/* Colors */
+		$this->add_section(
+			'colors',
+			array(
+				'title'    => __( 'Colors' ),
+				'priority' => 40,
+			)
+		);
+		$this->add_setting(
+			'header_textcolor',
+			array(
+				'theme_supports'       => array( 'custom-header', 'header-text' ),
+				'default'              => get_theme_support( 'custom-header', 'default-text-color' ),
+				'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+				'sanitize_js_callback' => 'maybe_hash_hex_color',
+			)
+		);
+		// Input type: checkbox
+		// With custom value
+		$this->add_control(
+			'display_header_text',
+			array(
+				'settings' => 'header_textcolor',
 				'label'    => __( 'Display Site Title and Tagline' ),
 				'section'  => 'title_tagline',
-				'settings' => 'header_text',
 				'type'     => 'checkbox',
-			) );
+				'priority' => 40,
-		}
+			)
+		);
-		$this->add_setting( 'site_icon', array(
-			'type'       => 'option',
+		$this->add_control(
-			'capability' => 'manage_options',
+			new WP_Customize_Color_Control(
-			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
+				$this,
-		) );
+				'header_textcolor',
+				array(
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
+					'label'   => __( 'Header Text Color' ),
-			'label'       => __( 'Site Icon' ),
+					'section' => 'colors',
-			'description' => sprintf(
+				)
-				'<p>' . __( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ) . '</p>' .
+			)
-				/* translators: %s: site icon size in pixels */
+		);
-				'<p>' . __( 'Site Icons should be square and at least %s pixels.' ) . '</p>',
-				'<strong>512 &times; 512</strong>'
-			),
-			'section'     => 'title_tagline',
-			'priority'    => 60,
-			'height'      => 512,
-			'width'       => 512,
-		) ) );
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
-			'transport'      => 'postMessage',
-		) );
-		$custom_logo_args = get_theme_support( 'custom-logo' );
-		$this->add_control( new WP_Customize_Cropped_Image_Control( $this, 'custom_logo', array(
-			'label'         => __( 'Logo' ),
-			'section'       => 'title_tagline',
-			'priority'      => 8,
-			'height'        => $custom_logo_args[0]['height'],
-			'width'         => $custom_logo_args[0]['width'],
-			'flex_height'   => $custom_logo_args[0]['flex-height'],
-			'flex_width'    => $custom_logo_args[0]['flex-width'],
-			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
-			),
-		) ) );
-		$this->selective_refresh->add_partial( 'custom_logo', array(
-			'settings'            => array( 'custom_logo' ),
-			'selector'            => '.custom-logo-link',
-			'render_callback'     => array( $this, '_render_custom_logo_partial' ),
-			'container_inclusive' => true,
-		) );
-		/* Colors */
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
-			'priority'       => 40,
-		) );
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
-			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
-		// Input type: checkbox
-		// With custom value
-		$this->add_control( 'display_header_text', array(
-			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
-			'section'  => 'title_tagline',
-			'type'     => 'checkbox',
-			'priority' => 40,
-		) );
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
-			'section' => 'colors',
-		) ) );
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
+		$this->add_setting(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+			'background_color',
-			'theme_supports' => 'custom-background',
+			array(
+				'default'              => get_theme_support( 'custom-background', 'default-color' ),
-			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
+				'theme_supports'       => 'custom-background',
-			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+				'sanitize_callback'    => 'sanitize_hex_color_no_hash',
+				'sanitize_js_callback' => 'maybe_hash_hex_color',
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
+			)
-			'label'   => __( 'Background Color' ),
+		);
-			'section' => 'colors',
-		) ) );
+		$this->add_control(
+			new WP_Customize_Color_Control(
+				$this,
+				'background_color',
+				array(
+					'label'   => __( 'Background Color' ),
+					'section' => 'colors',
+				)
+			)
+		);
 		/* Custom Header */
 		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$title = __( 'Header Media' );
+			$title       = __( 'Header Media' );
 			$description = '<p>' . __( 'If you add a video, the image will be used as a fallback while the video loads.' ) . '</p>';
-			$width = absint( get_theme_support( 'custom-header', 'width' ) );
+			$width  = absint( get_theme_support( 'custom-header', 'width' ) );
 			$height = absint( get_theme_support( 'custom-header', 'height' ) );
 			if ( $width && $height ) {
 				$control_description = sprintf(
 					/* translators: 1: .mp4, 2: header size in pixels */
 					__( 'Upload your video in %1$s format and minimize its file size for best results. Your theme recommends dimensions of %2$s pixels.' ),
 					'<code>.mp4</code>',
 					sprintf( '<strong>%s</strong>', $height )
 				);
 			}
 		} else {
-			$title = __( 'Header Image' );
+			$title               = __( 'Header Image' );
-			$description = '';
+			$description         = '';
 			$control_description = '';
 		}
-		$this->add_section( 'header_image', array(
+		$this->add_section(
-			'title'          => $title,
+			'header_image',
-			'description'    => $description,
+			array(
-			'theme_supports' => 'custom-header',
+				'title'          => $title,
-			'priority'       => 60,
+				'description'    => $description,
-		) );
+				'theme_supports' => 'custom-header',
+				'priority'       => 60,
-		$this->add_setting( 'header_video', array(
+			)
-			'theme_supports'    => array( 'custom-header', 'video' ),
+		);
-			'transport'         => 'postMessage',
-			'sanitize_callback' => 'absint',
+		$this->add_setting(
-			'validate_callback' => array( $this, '_validate_header_video' ),
+			'header_video',
-		) );
+			array(
+				'theme_supports'    => array( 'custom-header', 'video' ),
-		$this->add_setting( 'external_header_video', array(
+				'transport'         => 'postMessage',
-			'theme_supports'    => array( 'custom-header', 'video' ),
+				'sanitize_callback' => 'absint',
-			'transport'         => 'postMessage',
+				'validate_callback' => array( $this, '_validate_header_video' ),
-			'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
+			)
-			'validate_callback' => array( $this, '_validate_external_header_video' ),
+		);
-		) );
+		$this->add_setting(
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
+			'external_header_video',
-			'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
+			array(
-			'theme_supports' => 'custom-header',
+				'theme_supports'    => array( 'custom-header', 'video' ),
-		) ) );
+				'transport'         => 'postMessage',
+				'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+				'validate_callback' => array( $this, '_validate_external_header_video' ),
-			'theme_supports' => 'custom-header',
+			)
-		) ) );
+		);
+		$this->add_setting(
+			new WP_Customize_Filter_Setting(
+				$this,
+				'header_image',
+				array(
+					'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
+					'theme_supports' => 'custom-header',
+				)
+			)
+		);
+		$this->add_setting(
+			new WP_Customize_Header_Image_Setting(
+				$this,
+				'header_image_data',
+				array(
+					'theme_supports' => 'custom-header',
+				)
+			)
+		);
 		/*
 		 * Switch image settings to postMessage when video support is enabled since
 		 * it entails that the_custom_header_markup() will be used, and thus selective
 		 * refresh can be utilized.
 		 */
 		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$this->get_setting( 'header_image' )->transport = 'postMessage';
+			$this->get_setting( 'header_image' )->transport      = 'postMessage';
 			$this->get_setting( 'header_image_data' )->transport = 'postMessage';
 		}
-		$this->add_control( new WP_Customize_Media_Control( $this, 'header_video', array(
+		$this->add_control(
-			'theme_supports' => array( 'custom-header', 'video' ),
+			new WP_Customize_Media_Control(
-			'label'          => __( 'Header Video' ),
+				$this,
-			'description'    => $control_description,
+				'header_video',
-			'section'        => 'header_image',
+				array(
-			'mime_type'      => 'video',
+					'theme_supports'  => array( 'custom-header', 'video' ),
-			'active_callback' => 'is_header_video_active',
+					'label'           => __( 'Header Video' ),
-		) ) );
+					'description'     => $control_description,
+					'section'         => 'header_image',
-		$this->add_control( 'external_header_video', array(
+					'mime_type'       => 'video',
-			'theme_supports' => array( 'custom-header', 'video' ),
+					'active_callback' => 'is_header_video_active',
-			'type'           => 'url',
+				)
-			'description'    => __( 'Or, enter a YouTube URL:' ),
+			)
-			'section'        => 'header_image',
+		);
-			'active_callback' => 'is_header_video_active',
-		) );
+		$this->add_control(
+			'external_header_video',
+			array(
+				'theme_supports'  => array( 'custom-header', 'video' ),
+				'type'            => 'url',
+				'description'     => __( 'Or, enter a YouTube URL:' ),
+				'section'         => 'header_image',
+				'active_callback' => 'is_header_video_active',
+			)
+		);
 		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
-		$this->selective_refresh->add_partial( 'custom_header', array(
+		$this->selective_refresh->add_partial(
-			'selector'            => '#wp-custom-header',
+			'custom_header',
-			'render_callback'     => 'the_custom_header_markup',
+			array(
-			'settings'            => array( 'header_video', 'external_header_video', 'header_image' ), // The image is used as a video fallback here.
+				'selector'            => '#wp-custom-header',
-			'container_inclusive' => true,
+				'render_callback'     => 'the_custom_header_markup',
-		) );
+				'settings'            => array( 'header_video', 'external_header_video', 'header_image' ), // The image is used as a video fallback here.
+				'container_inclusive' => true,
+			)
+		);
 		/* Custom Background */
-		$this->add_section( 'background_image', array(
+		$this->add_section(
-			'title'          => __( 'Background Image' ),
+			'background_image',
-			'theme_supports' => 'custom-background',
+			array(
-			'priority'       => 80,
+				'title'          => __( 'Background Image' ),
-		) );
+				'theme_supports' => 'custom-background',
+				'priority'       => 80,
-		$this->add_setting( 'background_image', array(
+			)
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		);
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+		$this->add_setting(
-		) );
+			'background_image',
+			array(
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+				'default'           => get_theme_support( 'custom-background', 'default-image' ),
-			'theme_supports' => 'custom-background',
+				'theme_supports'    => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) ) );
+			)
+		);
+		$this->add_setting(
+			new WP_Customize_Background_Image_Setting(
+				$this,
+				'background_image_thumb',
+				array(
+					'theme_supports'    => 'custom-background',
+					'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				)
+			)
+		);
 		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
-		$this->add_setting( 'background_preset', array(
+		$this->add_setting(
-			'default'        => get_theme_support( 'custom-background', 'default-preset' ),
+			'background_preset',
-			'theme_supports' => 'custom-background',
+			array(
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'default'           => get_theme_support( 'custom-background', 'default-preset' ),
-		) );
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		$this->add_control( 'background_preset', array(
+			)
-			'label'      => _x( 'Preset', 'Background Preset' ),
+		);
-			'section'    => 'background_image',
-			'type'       => 'select',
+		$this->add_control(
-			'choices'    => array(
+			'background_preset',
-				'default' => _x( 'Default', 'Default Preset' ),
+			array(
-				'fill'    => __( 'Fill Screen' ),
+				'label'   => _x( 'Preset', 'Background Preset' ),
-				'fit'     => __( 'Fit to Screen' ),
+				'section' => 'background_image',
-				'repeat'  => _x( 'Repeat', 'Repeat Image' ),
+				'type'    => 'select',
-				'custom'  => _x( 'Custom', 'Custom Preset' ),
+				'choices' => array(
-			),
+					'default' => _x( 'Default', 'Default Preset' ),
-		) );
+					'fill'    => __( 'Fill Screen' ),
+					'fit'     => __( 'Fit to Screen' ),
-		$this->add_setting( 'background_position_x', array(
+					'repeat'  => _x( 'Repeat', 'Repeat Image' ),
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+					'custom'  => _x( 'Custom', 'Custom Preset' ),
-			'theme_supports' => 'custom-background',
+				),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			)
-		) );
+		);
-		$this->add_setting( 'background_position_y', array(
+		$this->add_setting(
-			'default'        => get_theme_support( 'custom-background', 'default-position-y' ),
+			'background_position_x',
-			'theme_supports' => 'custom-background',
+			array(
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'default'           => get_theme_support( 'custom-background', 'default-position-x' ),
-		) );
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		$this->add_control( new WP_Customize_Background_Position_Control( $this, 'background_position', array(
+			)
-			'label'    => __( 'Image Position' ),
+		);
-			'section'  => 'background_image',
-			'settings' => array(
+		$this->add_setting(
-				'x' => 'background_position_x',
+			'background_position_y',
-				'y' => 'background_position_y',
+			array(
-			),
+				'default'           => get_theme_support( 'custom-background', 'default-position-y' ),
-		) ) );
+				'theme_supports'    => 'custom-background',
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		$this->add_setting( 'background_size', array(
+			)
-			'default'        => get_theme_support( 'custom-background', 'default-size' ),
+		);
-			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+		$this->add_control(
-		) );
+			new WP_Customize_Background_Position_Control(
+				$this,
-		$this->add_control( 'background_size', array(
+				'background_position',
-			'label'      => __( 'Image Size' ),
+				array(
-			'section'    => 'background_image',
+					'label'    => __( 'Image Position' ),
-			'type'       => 'select',
+					'section'  => 'background_image',
-			'choices'    => array(
+					'settings' => array(
-				'auto'    => __( 'Original' ),
+						'x' => 'background_position_x',
-				'contain' => __( 'Fit to Screen' ),
+						'y' => 'background_position_y',
-				'cover'   => __( 'Fill Screen' ),
+					),
-			),
+				)
-		) );
+			)
+		);
-		$this->add_setting( 'background_repeat', array(
-			'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
+		$this->add_setting(
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+			'background_size',
-			'theme_supports'    => 'custom-background',
+			array(
-		) );
+				'default'           => get_theme_support( 'custom-background', 'default-size' ),
+				'theme_supports'    => 'custom-background',
-		$this->add_control( 'background_repeat', array(
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-			'label'    => __( 'Repeat Background Image' ),
+			)
-			'section'  => 'background_image',
+		);
-			'type'     => 'checkbox',
-		) );
+		$this->add_control(
+			'background_size',
-		$this->add_setting( 'background_attachment', array(
+			array(
-			'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
+				'label'   => __( 'Image Size' ),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'section' => 'background_image',
-			'theme_supports'    => 'custom-background',
+				'type'    => 'select',
-		) );
+				'choices' => array(
+					'auto'    => __( 'Original' ),
-		$this->add_control( 'background_attachment', array(
+					'contain' => __( 'Fit to Screen' ),
-			'label'    => __( 'Scroll with Page' ),
+					'cover'   => __( 'Fill Screen' ),
-			'section'  => 'background_image',
+				),
-			'type'     => 'checkbox',
+			)
-		) );
+		);
+		$this->add_setting(
+			'background_repeat',
+			array(
+				'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'theme_supports'    => 'custom-background',
+			)
+		);
+		$this->add_control(
+			'background_repeat',
+			array(
+				'label'   => __( 'Repeat Background Image' ),
+				'section' => 'background_image',
+				'type'    => 'checkbox',
+			)
+		);
+		$this->add_setting(
+			'background_attachment',
+			array(
+				'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
+				'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+				'theme_supports'    => 'custom-background',
+			)
+		);
+		$this->add_control(
+			'background_attachment',
+			array(
+				'label'   => __( 'Scroll with Page' ),
+				'section' => 'background_image',
+				'type'    => 'checkbox',
+			)
+		);
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
 		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
 			foreach ( array( 'color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment' ) as $prop ) {
 		 * Static Front Page
 		 * See also https://core.trac.wordpress.org/ticket/19627 which introduces the static-front-page theme_support.
 		 * The following replicates behavior from options-reading.php.
 		 */
-		$this->add_section( 'static_front_page', array(
+		$this->add_section(
-			'title' => __( 'Homepage Settings' ),
+			'static_front_page',
-			'priority' => 120,
+			array(
-			'description' => __( 'You can choose what&#8217;s displayed on the homepage of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static homepage, you first need to create two Pages. One will become the homepage, and the other will be where your posts are displayed.' ),
+				'title'           => __( 'Homepage Settings' ),
-			'active_callback' => array( $this, 'has_published_pages' ),
+				'priority'        => 120,
-		) );
+				'description'     => __( 'You can choose what&#8217;s displayed on the homepage of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static homepage, you first need to create two Pages. One will become the homepage, and the other will be where your posts are displayed.' ),
+				'active_callback' => array( $this, 'has_published_pages' ),
-		$this->add_setting( 'show_on_front', array(
+			)
-			'default' => get_option( 'show_on_front' ),
+		);
-			'capability' => 'manage_options',
-			'type' => 'option',
+		$this->add_setting(
-		) );
+			'show_on_front',
+			array(
-		$this->add_control( 'show_on_front', array(
+				'default'    => get_option( 'show_on_front' ),
-			'label' => __( 'Your homepage displays' ),
+				'capability' => 'manage_options',
-			'section' => 'static_front_page',
+				'type'       => 'option',
-			'type' => 'radio',
+			)
-			'choices' => array(
+		);
-				'posts' => __( 'Your latest posts' ),
-				'page'  => __( 'A static page' ),
+		$this->add_control(
-			),
+			'show_on_front',
-		) );
+			array(
+				'label'   => __( 'Your homepage displays' ),
-		$this->add_setting( 'page_on_front', array(
+				'section' => 'static_front_page',
-			'type'       => 'option',
+				'type'    => 'radio',
-			'capability' => 'manage_options',
+				'choices' => array(
-		) );
+					'posts' => __( 'Your latest posts' ),
+					'page'  => __( 'A static page' ),
-		$this->add_control( 'page_on_front', array(
+				),
-			'label' => __( 'Homepage' ),
+			)
-			'section' => 'static_front_page',
+		);
-			'type' => 'dropdown-pages',
-			'allow_addition' => true,
+		$this->add_setting(
-		) );
+			'page_on_front',
+			array(
-		$this->add_setting( 'page_for_posts', array(
+				'type'       => 'option',
-			'type' => 'option',
+				'capability' => 'manage_options',
-			'capability' => 'manage_options',
+			)
-		) );
+		);
-		$this->add_control( 'page_for_posts', array(
+		$this->add_control(
-			'label' => __( 'Posts page' ),
+			'page_on_front',
-			'section' => 'static_front_page',
+			array(
-			'type' => 'dropdown-pages',
+				'label'          => __( 'Homepage' ),
-			'allow_addition' => true,
+				'section'        => 'static_front_page',
-		) );
+				'type'           => 'dropdown-pages',
+				'allow_addition' => true,
+			)
+		);
+		$this->add_setting(
+			'page_for_posts',
+			array(
+				'type'       => 'option',
+				'capability' => 'manage_options',
+			)
+		);
+		$this->add_control(
+			'page_for_posts',
+			array(
+				'label'          => __( 'Posts page' ),
+				'section'        => 'static_front_page',
+				'type'           => 'dropdown-pages',
+				'allow_addition' => true,
+			)
+		);
 		/* Custom CSS */
-		$section_description = '<p>';
+		$section_description  = '<p>';
 		$section_description .= __( 'Add your own CSS code here to customize the appearance and layout of your site.' );
 		$section_description .= sprintf(
 			' <a href="%1$s" class="external-link" target="_blank">%2$s<span class="screen-reader-text"> %3$s</span></a>',
 			esc_url( __( 'https://codex.wordpress.org/CSS' ) ),
 			__( 'Learn more about CSS' ),
 			/* translators: accessibility text */
-			__( '(opens in a new window)' )
+			__( '(opens in a new tab)' )
 		);
 		$section_description .= '</p>';
 		$section_description .= '<p id="editor-keyboard-trap-help-1">' . __( 'When using a keyboard to navigate:' ) . '</p>';
 		$section_description .= '<ul>';
 			$section_description .= sprintf(
 				/* translators: 1: link to user profile, 2: additional link attributes, 3: accessibility text */
 				__( 'The edit field automatically highlights code syntax. You can disable this in your <a href="%1$s" %2$s>user profile%3$s</a> to work in plain text mode.' ),
 				esc_url( get_edit_profile_url() ),
 				'class="external-link" target="_blank"',
-				sprintf( '<span class="screen-reader-text"> %s</span>',
+				sprintf(
+					'<span class="screen-reader-text"> %s</span>',
 					/* translators: accessibility text */
-					__( '(opens in a new window)' )
+					__( '(opens in a new tab)' )
 				)
 			);
 			$section_description .= '</p>';
 		}
 		$section_description .= '<p class="section-description-buttons">';
 		$section_description .= '<button type="button" class="button-link section-description-close">' . __( 'Close' ) . '</button>';
 		$section_description .= '</p>';
-		$this->add_section( 'custom_css', array(
+		$this->add_section(
-			'title'              => __( 'Additional CSS' ),
+			'custom_css',
-			'priority'           => 200,
+			array(
-			'description_hidden' => true,
+				'title'              => __( 'Additional CSS' ),
-			'description'        => $section_description,
+				'priority'           => 200,
-		) );
+				'description_hidden' => true,
+				'description'        => $section_description,
-		$custom_css_setting = new WP_Customize_Custom_CSS_Setting( $this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
+			)
-			'capability' => 'edit_css',
+		);
-			'default' => '',
-		) );
+		$custom_css_setting = new WP_Customize_Custom_CSS_Setting(
+			$this,
+			sprintf( 'custom_css[%s]', get_stylesheet() ),
+			array(
+				'capability' => 'edit_css',
+				'default'    => '',
+			)
+		);
 		$this->add_setting( $custom_css_setting );
-		$this->add_control( new WP_Customize_Code_Editor_Control( $this, 'custom_css', array(
+		$this->add_control(
-			'label'       => __( 'CSS code' ),
+			new WP_Customize_Code_Editor_Control(
-			'section'     => 'custom_css',
+				$this,
-			'settings'    => array( 'default' => $custom_css_setting->id ),
+				'custom_css',
-			'code_type'   => 'text/css',
+				array(
-			'input_attrs' => array(
+					'label'       => __( 'CSS code' ),
-				'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4',
+					'section'     => 'custom_css',
-			),
+					'settings'    => array( 'default' => $custom_css_setting->id ),
-		) ) );
+					'code_type'   => 'text/css',
+					'input_attrs' => array(
+						'aria-describedby' => 'editor-keyboard-trap-help-1 editor-keyboard-trap-help-2 editor-keyboard-trap-help-3 editor-keyboard-trap-help-4',
+					),
+				)
+			)
+		);
 	}
 	/**
 	 * Return whether there are published pages.
 	 *
 		if ( empty( $_POST['theme_action'] ) ) {
 			wp_send_json_error( 'missing_theme_action' );
 		}
 		$theme_action = sanitize_key( $_POST['theme_action'] );
-		$themes = array();
+		$themes       = array();
-		$args = array();
+		$args         = array();
 		// Define query filters based on user input.
 		if ( ! array_key_exists( 'search', $_POST ) ) {
 			$args['search'] = '';
 		} else {
 		if ( 'installed' === $theme_action ) {
 			// Load all installed themes from wp_prepare_themes_for_js().
 			$themes = array( 'themes' => wp_prepare_themes_for_js() );
 			foreach ( $themes['themes'] as &$theme ) {
-				$theme['type'] = 'installed';
+				$theme['type']   = 'installed';
 				$theme['active'] = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme['id'] );
 			}
 		} elseif ( 'wporg' === $theme_action ) {
 			// Load WordPress.org themes from the .org API and normalize data to match installed theme objects.
 			if ( ! current_user_can( 'install_themes' ) ) {
 				wp_die( -1 );
 			}
 			// Arguments for all queries.
 			$wporg_args = array(
 				'per_page' => 100,
-				'fields' => array(
+				'fields'   => array(
-					'screenshot_url' => true,
+					'reviews_url' => true, // Explicitly request the reviews URL to be linked from the customizer.
-					'description' => true,
-					'rating' => true,
-					'downloaded' => true,
-					'downloadlink' => true,
-					'last_updated' => true,
-					'homepage' => true,
-					'num_ratings' => true,
-					'tags' => true,
-					'parent' => true,
-					// 'extended_author' => true, @todo: WordPress.org throws a 500 server error when this is here.
 				),
 			);
 			$args = array_merge( $wporg_args, $args );
 			if ( is_wp_error( $themes ) ) {
 				wp_send_json_error();
 			}
 			// This list matches the allowed tags in wp-admin/includes/theme-install.php.
-			$themes_allowedtags = array_fill_keys(
+			$themes_allowedtags                     = array_fill_keys(
 				array( 'a', 'abbr', 'acronym', 'code', 'pre', 'em', 'strong', 'div', 'p', 'ul', 'ol', 'li', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img' ),
 				array()
 			);
-			$themes_allowedtags['a'] = array_fill_keys( array( 'href', 'title', 'target' ), true );
+			$themes_allowedtags['a']                = array_fill_keys( array( 'href', 'title', 'target' ), true );
 			$themes_allowedtags['acronym']['title'] = true;
-			$themes_allowedtags['abbr']['title'] = true;
+			$themes_allowedtags['abbr']['title']    = true;
-			$themes_allowedtags['img'] = array_fill_keys( array( 'src', 'class', 'alt' ), true );
+			$themes_allowedtags['img']              = array_fill_keys( array( 'src', 'class', 'alt' ), true );
 			// Prepare a list of installed themes to check against before the loop.
 			$installed_themes = array();
-			$wp_themes = wp_get_themes();
+			$wp_themes        = wp_get_themes();
 			foreach ( $wp_themes as $theme ) {
 				$installed_themes[] = $theme->get_stylesheet();
 			}
 			$update_php = network_admin_url( 'update.php?action=install-theme' );
 			// Set up properties for themes available on WordPress.org.
 			foreach ( $themes->themes as &$theme ) {
-				$theme->install_url = add_query_arg( array(
+				$theme->install_url = add_query_arg(
-					'theme'    => $theme->slug,
+					array(
-					'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
+						'theme'    => $theme->slug,
-				), $update_php );
+						'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug ),
+					),
+					$update_php
+				);
 				$theme->name        = wp_kses( $theme->name, $themes_allowedtags );
-				$theme->author      = wp_kses( $theme->author, $themes_allowedtags );
 				$theme->version     = wp_kses( $theme->version, $themes_allowedtags );
 				$theme->description = wp_kses( $theme->description, $themes_allowedtags );
-				$theme->tags        = implode( ', ', $theme->tags );
+				$theme->stars       = wp_star_rating(
-				$theme->stars       = wp_star_rating( array(
+					array(
-					'rating' => $theme->rating,
+						'rating' => $theme->rating,
-					'type' => 'percent',
+						'type'   => 'percent',
-					'number' => $theme->num_ratings,
+						'number' => $theme->num_ratings,
-					'echo' => false,
+						'echo'   => false,
-				) );
+					)
+				);
 				$theme->num_ratings = number_format_i18n( $theme->num_ratings );
 				$theme->preview_url = set_url_scheme( $theme->preview_url );
 				// Handle themes that are already installed as installed themes.
 				if ( in_array( $theme->slug, $installed_themes, true ) ) {
 				$theme->active = ( isset( $_POST['customized_theme'] ) && $_POST['customized_theme'] === $theme->slug );
 				// Map available theme properties to installed theme properties.
 				$theme->id           = $theme->slug;
 				$theme->screenshot   = array( $theme->screenshot_url );
-				$theme->authorAndUri = $theme->author;
+				$theme->authorAndUri = wp_kses( $theme->author['display_name'], $themes_allowedtags );
-				// The .org API can return the full parent theme details if passed the 'parent' arg, or if passed the 'template' option it'll return that in the event it's a child theme.
 				if ( isset( $theme->parent ) ) {
 					$theme->parent = $theme->parent['slug'];
 				} else {
 					$theme->parent = false;
 				}
 	 *
 	 * @param string $color
 	 * @return mixed
 	 */
 	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+		if ( 'blank' === $color ) {
 			return 'blank';
+		}
 		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
+		if ( empty( $color ) ) {
 			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		}
 		return $color;
 	}
 	/**
 	public function _validate_header_video( $validity, $value ) {
 		$video = get_attached_file( absint( $value ) );
 		if ( $video ) {
 			$size = filesize( $video );
 			if ( 8 < $size / pow( 1024, 2 ) ) { // Check whether the size is larger than 8MB.
-				$validity->add( 'size_too_large',
+				$validity->add(
+					'size_too_large',
 					__( 'This video file is too large to use as a header video. Try a shorter video or optimize the compression settings and re-upload a file that is less than 8MB. Or, upload your video to YouTube and link it with the option below.' )
 				);
 			}
 			if ( '.mp4' !== substr( $video, -4 ) && '.mov' !== substr( $video, -4 ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
-				$validity->add( 'invalid_file_type', sprintf(
+				$validity->add(
-					/* translators: 1: .mp4, 2: .mov */
+					'invalid_file_type',
-					__( 'Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.' ),
+					sprintf(
-					'<code>.mp4</code>',
+						/* translators: 1: .mp4, 2: .mov */
-					'<code>.mov</code>'
+						__( 'Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.' ),
-				) );
+						'<code>.mp4</code>',
+						'<code>.mov</code>'
+					)
+				);
 			}
 		}
 		return $validity;
 	}

changeset 9	177826044cd9
parent 7	cf61fcea0001
child 16	a86126ab1dd4